# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1276892044 0
# Node ID 5ec02acb206ba6cff259fc1b9a854d3d8ff14e72
# Parent  62f7ea77feb30e7a04e3f1febc537f64309d130e# Parent  490707649f29df7c985c653763af276fcc8767da
merge of '7fe056535dca3e50f6489654f491a2f9e487b4d4'
     and 'e3a6ef7390d7890b02866222f5f347f383cd6a48'

diff -r 62f7ea77feb3 -r 5ec02acb206b libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Fri Jun 18 01:39:55 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Fri Jun 18 20:14:04 2010 +0000
@@ -402,10 +402,10 @@
 	PurpleGroup *g;
 	GSList *list, *i;
 	gboolean onlist = FALSE;
-	char *oname;
+	char *oname = NULL;
 
 	if (g_hash_table_lookup_extended(ht, purple_normalize(account, name), (gpointer *)&oname, (gpointer *)&list))
-		g_hash_table_steal(ht, oname);
+		g_hash_table_steal(ht, name);
 	else
 		list = purple_find_buddies(account, name);
 
@@ -841,12 +841,12 @@
 			default:
 				break;
 		}
-	
+
 		if (*stat == '1')
 			serv_got_typing(gc, fed_from, 0, PURPLE_TYPING);
 		else
 			serv_got_typing_stopped(gc, fed_from);
-		
+
 		if (fed_from != from)
 			g_free(fed_from);