Mercurial > pidgin
changeset 21837:5c702ff46072
merge of '4268f3923b30680b7ec013f553a7733f4b24417d'
and 'a35fdd1f166003bb0d08537b715693c1786fe180'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sun, 16 Dec 2007 16:37:53 +0000 |
| parents | 543306932d15 (current diff) e552f16abc88 (diff) |
| children | a9347b5101a9 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.c Sun Dec 16 16:36:53 2007 +0000 +++ b/libpurple/protocols/msn/contact.c Sun Dec 16 16:37:53 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);
--- a/libpurple/protocols/sametime/sametime.c Sun Dec 16 16:36:53 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Sun Dec 16 16:37:53 2007 +0000 @@ -3749,7 +3749,7 @@ client = purple_account_get_int(account, MW_KEY_CLIENT, mwLogin_BINARY); major = purple_account_get_int(account, MW_KEY_MAJOR, 0x001e); - minor = purple_account_get_int(account, MW_KEY_MINOR, 0x001d); + minor = purple_account_get_int(account, MW_KEY_MINOR, 0x196f); DEBUG_INFO("client id: 0x%04x\n", client); DEBUG_INFO("client major: 0x%04x\n", major);