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

[Mark D. <the...@us...>]

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

Modified Files:
	oscar-icq-utf8-hack.diff 
Log Message:
This be a better fix mon.

This is also a really funky looking diff (because it's a diff of a diff).


Index: oscar-icq-utf8-hack.diff
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/oscar-icq-utf8-hack.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- oscar-icq-utf8-hack.diff	25 Oct 2003 12:21:11 -0000	1.1
+++ oscar-icq-utf8-hack.diff	25 Oct 2003 18:06:05 -0000	1.2
@@ -1,41 +1,11 @@
-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);
-+							}
+diff -ruN gaim-0.71/src/protocols/oscar/oscar.c gaim-0.71-fixed/src/protocols/oscar/oscar.c
+--- gaim-0.71/src/protocols/oscar/oscar.c	2003-10-06 00:15:21.000000000 -0400
++++ gaim-0.71-fixed/src/protocols/oscar/oscar.c	2003-10-25 14:02:01.000000000 -0400
+@@ -4789,6 +4789,7 @@
  
--						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);
+ 	/* Add from server list to local list */
+ 	for (curitem=sess->ssi.local; curitem; curitem=curitem->next) {
++		if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL)))
+ 		switch (curitem->type) {
+ 			case 0x0000: { /* Buddy */
+ 				if (curitem->name) {