Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv25826/src/protocols/jabber
Modified Files:
jabber.c
Log Message:
Remainder of fix for Gaim crashing on non-ASCII buddy alias (Jabber "name"
attribute) chars. (Thanks, A Ho-seok Lee)
Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- jabber.c 15 Jun 2002 20:22:28 -0000 1.55
+++ jabber.c 19 Jun 2002 21:20:08 -0000 1.56
@@ -1710,6 +1710,9 @@
/*
* Add or remove a buddy? Change buddy's alias or group?
*/
+ if(name)
+ name = utf8_to_str(name);
+
if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
if ((b = find_buddy(GJ_GC(gjc), buddyname)) == NULL) {
debug_printf("adding buddy [4]: %s\n", buddyname);
@@ -1748,6 +1751,10 @@
} else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
}
+
+ if(name)
+ g_free(name);
+
g_free(buddyname);
}
|
