Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
32438:55e678325bda | 32692:0f94ec89f0bc |
---|---|
3804 groups = g_list_append(groups, | 3804 groups = g_list_append(groups, |
3805 purple_buddy_get_group((PurpleBuddy*)node)); | 3805 purple_buddy_get_group((PurpleBuddy*)node)); |
3806 } | 3806 } |
3807 | 3807 |
3808 purple_account_remove_buddies(account, moved_buddies, groups); | 3808 purple_account_remove_buddies(account, moved_buddies, groups); |
3809 purple_account_add_buddies(account, moved_buddies); | 3809 purple_account_add_buddies(account, moved_buddies, NULL); |
3810 g_list_free(groups); | 3810 g_list_free(groups); |
3811 purple_debug_info("oscar", | 3811 purple_debug_info("oscar", |
3812 "ssi: moved all buddies from group %s to %s\n", old_name, gname); | 3812 "ssi: moved all buddies from group %s to %s\n", old_name, gname); |
3813 } else { | 3813 } else { |
3814 aim_ssi_rename_group(od, old_name, gname); | 3814 aim_ssi_rename_group(od, old_name, gname); |
5038 | 5038 |
5039 buddy = (PurpleBuddy*)node; | 5039 buddy = (PurpleBuddy*)node; |
5040 name = purple_buddy_get_name(buddy); | 5040 name = purple_buddy_get_name(buddy); |
5041 account = purple_buddy_get_account(buddy); | 5041 account = purple_buddy_get_account(buddy); |
5042 gc = purple_account_get_connection(account); | 5042 gc = purple_account_get_connection(account); |
5043 od = gc->proto_data; | 5043 od = purple_connection_get_protocol_data(gc); |
5044 conn = peer_connection_find_by_type(od, name, OSCAR_CAPABILITY_DIRECTIM); | 5044 conn = peer_connection_find_by_type(od, name, OSCAR_CAPABILITY_DIRECTIM); |
5045 | 5045 |
5046 if (conn != NULL) | 5046 if (conn != NULL) |
5047 { | 5047 { |
5048 if (!conn->ready) | 5048 if (!conn->ready) |