pidgin: 018335d3: There is code above these lines, just be...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 018335d39d5488d4512acce61adbb0318d01334f
Parent:   d22cf180ef4763233a7ca6d28fa6c4ccd6fc548c
Author:   markdoliner at pidgin.im
Date:     02/21/11 04:28:03
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/018335d39d5488d4512acce61adbb0318d01334f

Changelog: 

There is code above these lines, just before the start of the switch(),
that validates that curitem->name is utf8.  So we don't need to bother
with oscar_utf8_try_convert() here.

I know there has been some concern in the past about some people having
non-utf8 names in their server list and wanting Pidgin to deal with that
intelligently... all I can say is this commit shouldn't change the current
functionality.  It looks like we currently ignore groups from the server
list if they're non-utf8, and it looks like it's been that way since at
least 2.7.3, and more likely before then.

Changes against parent d22cf180ef4763233a7ca6d28fa6c4ccd6fc548c

  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	d6659f3e25448a5ea39e6ee2f09f81287a29b71d
+++ libpurple/protocols/oscar/oscar.c	007506f489c72c6bf026f3d20bd934c8380fc64c
@@ -4051,17 +4051,10 @@ static int purple_ssi_parselist(OscarDat
 			} break;
 
 			case AIM_SSI_TYPE_GROUP: { /* Group */
-				char *gname;
-				char *gname_utf8;
-
-				gname = curitem->name;
-				gname_utf8 = oscar_utf8_try_convert(account, od, gname);
-
-				if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) {
-					g = purple_group_new(gname_utf8);
+				if (curitem->name != NULL && purple_find_group(curitem->name) == NULL) {
+					g = purple_group_new(curitem->name);
 					purple_blist_add_group(g, NULL);
 				}
-				g_free(gname_utf8);
 			} break;
 
 			case AIM_SSI_TYPE_PERMIT: { /* Permit buddy (unless we're on ICQ) */