pidgin: ea0921d4: So it turns out the name vs oname thing ...

rekkanoryo at rekkanoryo at
Sat Jun 19 12:20:57 EDT 2010

Revision: ea0921d43a5820fff32499ae68b7550b0779fec2
Ancestor: 729b63af926beb43b3250b2a744b67d654624cc7
Author: rekkanoryo at
Date: 2010-06-19T16:15:19
Branch: im.pidgin.pidgin

Modified files:


So it turns out the name vs oname thing wasn't a typo on Mark's part.  I just
misinterpreted it.  Fix that and also avoid use of purple_normalize() in this
function, because both places it's called already normalize strings before
passing them in.  No sense normalizing the same string twice.

-------------- next part --------------
--- libpurple/protocols/yahoo/libymsg.c	f559efc53c46efa0e9678a2e898cb0644fc902a5
+++ libpurple/protocols/yahoo/libymsg.c	6090714a7b0fb9c74656b7346d20c6be74c9176e
@@ -404,8 +404,8 @@ static void yahoo_do_group_check(PurpleA
 	gboolean onlist = FALSE;
 	char *oname = NULL;
-	if (g_hash_table_lookup_extended(ht, purple_normalize(account, name), (gpointer *)&oname, (gpointer *)&list))
-		g_hash_table_steal(ht, name);
+	if (g_hash_table_lookup_extended(ht, name, (gpointer *)&oname, (gpointer *)&list))
+		g_hash_table_steal(ht, oname);
 		list = purple_find_buddies(account, name);
@@ -434,7 +434,7 @@ static void yahoo_do_group_check(PurpleA
 	if (list) {
 		if (!oname)
-			oname = g_strdup(purple_normalize(account, name));
+			oname = g_strdup(name);
 		g_hash_table_insert(ht, oname, list);
 	} else

More information about the Commits mailing list