Mercurial > pidgin

changeset 30214:3ae0814ae727

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 19 Jun 2010 16:15:19 +0000
parents 597840eccfa7
children c2c61981f98d
files libpurple/protocols/yahoo/libymsg.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c	Fri Jun 18 20:14:06 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sat Jun 19 16:15:19 2010 +0000
@@ -404,8 +404,8 @@
 	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);
 	else
 		list = purple_find_buddies(account, name);
 
@@ -434,7 +434,7 @@
 
 	if (list) {
 		if (!oname)
-			oname = g_strdup(purple_normalize(account, name));
+			oname = g_strdup(name);
 		g_hash_table_insert(ht, oname, list);
 	} else
 		g_free(oname);