Mercurial > pidgin.yaz
changeset 22294:33b5a0e92583
merge of '5e11f89fad2bba2d5ef3307befb618c9ca110561'
and '6876f96b926c6734531d2353ef014328769d2ae6'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 14 Feb 2008 12:42:58 +0000 |
| parents | 5aabf4e24188 (diff) 708f66f5a608 (current diff) |
| children | bb124c3e668c |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c Wed Feb 13 06:00:50 2008 +0000 +++ b/libpurple/protocols/myspace/myspace.c Thu Feb 14 12:42:58 2008 +0000 @@ -2797,7 +2797,14 @@ * the documentation claims). */ group_name = msim_msg_get_string(contact_info, "GroupName"); if (group_name) { - group = purple_group_new(group_name); + group = purple_find_group(group_name); + if (!group) { + group = purple_group_new(group_name); + /* Add group to beginning. See #2752. */ + purple_blist_add_group(group, NULL); + + } + purple_debug_info("msim_add_contact_from_server_cb", "adding to GroupName: %s\n", group_name); g_free(group_name); @@ -2813,9 +2820,6 @@ buddy = purple_buddy_new(session->account, username, NULL); } - /* Add group to beginning. See #2752. */ - purple_blist_add_group(group, NULL); - /* TODO: use 'Position' in contact_info to take into account where buddy is */ purple_blist_add_buddy(buddy, NULL, group, NULL /* insertion point */);