Mercurial > pidgin.yaz

changeset 21836:e552f16abc88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '1d887e0b6d13b709051a68be9b34c28d2254dadb' and '4a7e68c5d619eeeaf26a687c139afcb1663d49d8'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 16 Dec 2007 00:36:02 +0000
parents 068b412ba385 (diff) 1dd83e2e582d (current diff)
children 5c702ff46072
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.c	Sat Dec 15 22:29:38 2007 +0000
+++ b/libpurple/protocols/msn/contact.c	Sun Dec 16 00:36:02 2007 +0000
@@ -1289,16 +1289,16 @@
 				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);
 				} else if (state->action & MSN_MOVE_BUDDY) {
 					msn_add_contact_to_group(session->contact, state, state->who, guid); 
+					g_free(guid);
 					return;
 				}
+				g_free(guid);
 			} else {
 				purple_debug_info("MSNCL", "Adding group %s failed\n",
 					state->new_group_name);