im.pidgin.pidgin: fb02a135c595d1c1e563863ce11085eb3222c724

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: fb02a135c595d1c1e563863ce11085eb3222c724
Ancestor: 3bad01a9dd265df296763555587dc16bd57aa3d6
Author: khc at pidgin.im
Date: 2007-11-03T05:37:59
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/soap2.c

ChangeLog: 

initialize a variable to NULL, and not crash when you move a buddy to a new
group. Doesn't do the right thing yet, but at least doesn't crash

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	269a361e64114ca25fe5561ba4a2bd232e864dbe
+++ libpurple/protocols/msn/contact.c	0751424f6281605d99e0185f1950543dfd031516
@@ -1277,16 +1277,16 @@ msn_group_read_cb(MsnSoapMessage *req, M
 				purple_debug_info("MSNCL", "Adding group %s with guid = %s to the userlist\n", state->new_group_name, guid);
 				msn_group_new(session->userlist, guid, state->new_group_name);
 
+				g_free(guid);
+
 				if (state->action & MSN_ADD_BUDDY) {
 					msn_userlist_add_buddy(session->userlist,
 						state->who,
 						state->new_group_name);
-					msn_callback_state_free(state);
 				} else if (state->action & MSN_MOVE_BUDDY) {
 					msn_add_contact_to_group(session->contact, state, state->who, guid); 
+					return;
 				}
-
-				g_free(guid);
 			} else {
 				purple_debug_info("MSNCL", "Adding group %s failed\n",
 					state->new_group_name);
============================================================
--- libpurple/protocols/msn/soap2.c	f13a5708cb94c1ae058fa25f48fe6a9856b96e19
+++ libpurple/protocols/msn/soap2.c	ee19e56fdff8f846c5c703081e70334aec76e4db
@@ -648,7 +648,7 @@ msn_soap_xml_get(xmlnode *parent, const 
 xmlnode *
 msn_soap_xml_get(xmlnode *parent, const char *node)
 {
-	xmlnode *ret;
+	xmlnode *ret = NULL;
 	char **tokens = g_strsplit(node, "/", -1);
 	int i;