# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1227737674 0
# Node ID 414886d7a51cd2d4d4908cd76cc5ec7d4561e2b1
# Parent  9a5d98ddca8d624655ac15a2d0a70aa41fffcfa0# Parent  737bf6236bd36784878b5bbf6f29e4b30b342015
propagate from branch 'im.pidgin.pidgin' (head d6650bbce66004cf205e9f60ef96626783db72e8)
            to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 4491e1af4a9262cd67501541c84475c417386ced)

diff -r 9a5d98ddca8d -r 414886d7a51c libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c	Wed Nov 26 22:11:44 2008 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Wed Nov 26 22:14:34 2008 +0000
@@ -348,7 +348,7 @@
 	gchar *utf8;
 	GError *err = NULL;
 	zephyr_account *zephyr = gc->proto_data;
-	if (g_utf8_validate(string, len, NULL)) {
+	if (g_utf8_validate(string, -1, NULL)) {
 		return g_strdup(string);
 	} else {
 		utf8 = g_convert(string, -1, "UTF-8", zephyr->encoding, NULL, NULL, &err);
@@ -896,7 +896,7 @@
 #ifndef INET_ADDRSTRLEN
 #define INET_ADDRSTRLEN 16
 #endif
-			if (!purple_conv_chat_find_user(gcc, sendertmp)) {
+			if (!purple_conv_chat_find_user(gcc, stripped_sender)) {
 				gchar ipaddr[INET_ADDRSTRLEN];
 #ifdef HAVE_INET_NTOP
 				inet_ntop(AF_INET, &notice.z_sender_addr.s_addr, ipaddr, sizeof(ipaddr));