[Gaim-commits] CVS: web/htdocs oscar-icq-utf8-hack.diff,NONE,1.1

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv30767/htdocs

Added Files:
	oscar-icq-utf8-hack.diff 
Log Message:
icq crash fix patch so people don't have to wait for 0.72


--- NEW FILE: oscar-icq-utf8-hack.diff ---
Index: src/protocols/oscar/oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.485
diff -u -r1.485 oscar.c
--- src/protocols/oscar/oscar.c	22 Oct 2003 03:32:21 -0000	1.485
+++ src/protocols/oscar/oscar.c	24 Oct 2003 22:05:31 -0000
@@ -4820,17 +4820,24 @@
 						}
 					} else {
 						GaimGroup *g;
-						buddy = gaim_buddy_new(gc->account, curitem->name, alias_utf8);
-
-						if (!(g = gaim_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
-							g = gaim_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
-							gaim_blist_add_group(g, NULL);
+						/* cheesy hack to avoid startup crashes when adding buddies */
+						if ( isdigit(curitem->name[0]) && !isdigit(curitem->name[strlen(curitem->name) - 1]) )
+						{
+							/* duplicated contact from new ICQ protocol, with a funky trailing char */
 						}
+						else {
+							buddy = gaim_buddy_new(gc->account, curitem->name, alias_utf8);
+
+							if (!(g = gaim_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
+								g = gaim_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
+								gaim_blist_add_group(g, NULL);
+							}
 
-						gaim_debug(GAIM_DEBUG_INFO, "oscar",
-								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname_utf8 ? gname_utf8 : _("Orphans"));
-						gaim_blist_add_buddy(buddy, NULL, g, NULL);
-						export = TRUE;
+							gaim_debug(GAIM_DEBUG_INFO, "oscar",
+								   	"ssi: adding buddy %s to group %s to local list\n", curitem->name, gname_utf8 ? gname_utf8 : _("Orphans"));
+							gaim_blist_add_buddy(buddy, NULL, g, NULL);
+							export = TRUE;
+						}
 					}
 					g_free(gname_utf8);
 					g_free(alias_utf8);