Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/oscar.c @ 32692:0f94ec89f0bc
merged from im.pidgin.pidgin
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Mon, 26 Sep 2011 14:57:21 +0900 |
| parents | ac6353ffa129 cd1d9e04c587 |
| children | 4a34689eeb33 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Mon Aug 29 12:59:57 2011 +0900 +++ b/libpurple/protocols/oscar/oscar.c Mon Sep 26 14:57:21 2011 +0900 @@ -3806,7 +3806,7 @@ } purple_account_remove_buddies(account, moved_buddies, groups); - purple_account_add_buddies(account, moved_buddies); + purple_account_add_buddies(account, moved_buddies, NULL); g_list_free(groups); purple_debug_info("oscar", "ssi: moved all buddies from group %s to %s\n", old_name, gname); @@ -5040,7 +5040,7 @@ name = purple_buddy_get_name(buddy); account = purple_buddy_get_account(buddy); gc = purple_account_get_connection(account); - od = gc->proto_data; + od = purple_connection_get_protocol_data(gc); conn = peer_connection_find_by_type(od, name, OSCAR_CAPABILITY_DIRECTIM); if (conn != NULL)