[Gaim-commits] SF.net SVN: gaim: [16233] branches/v2_0_0/src/protocols/jabber/roster.c

[<ebl...@us...>]

Revision: 16233
Author:   eblanton
Date:     2006-06-07 21:55:11 -0700 (Wed, 07 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16233&view=rev

Log Message:
-----------
Applying the following commit to the v2_0_0 branch:
------------------------------------------------------------------------
r16232 | eblanton | 2006-06-08 00:27:04 -0400 (Thu, 08 Jun 2006) | 6 lines

Don Seiler submitted this patch to bug #1426339.  It compensates for a
jabber server error where some broken servers send more than one group
name with a buddy.  Or something like that.  In any case, the server
was broken and Gaim didn't handle it very gracefully, and it's a
one-line fix.

------------------------------------------------------------------------

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/jabber/roster.c
Modified: branches/v2_0_0/src/protocols/jabber/roster.c
===================================================================
--- branches/v2_0_0/src/protocols/jabber/roster.c	2006-06-08 04:27:04 UTC (rev 16232)
+++ branches/v2_0_0/src/protocols/jabber/roster.c	2006-06-08 04:55:11 UTC (rev 16233)
@@ -21,6 +21,7 @@
 #include "internal.h"
 #include "debug.h"
 #include "server.h"
+#include "util.h"
 
 #include "buddy.h"
 #include "presence.h"
@@ -202,7 +203,9 @@
 
 				if(!(group_name = xmlnode_get_data(group)))
 					group_name = g_strdup("");
-				groups = g_slist_append(groups, group_name);
+
+				if (g_slist_find_custom(groups, group_name, (GCompareFunc)gaim_utf8_strcasecmp) == NULL)
+					groups = g_slist_append(groups, group_name);
 			}
 			add_gaim_buddies_in_groups(js, jid, name, groups);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.