diff -r e093c956c5e5 -r c0aef3b64c56 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Sat Sep 07 02:30:39 2013 +0530 +++ b/pidgin/gtkdialogs.c Thu Sep 12 19:08:48 2013 +0530 @@ -945,8 +945,7 @@ fields, _("OK"), G_CALLBACK(pidgin_dialogs_im_cb), _("Cancel"), NULL, - NULL, NULL, NULL, - NULL); + NULL, NULL); } void @@ -1085,8 +1084,7 @@ fields, _("OK"), G_CALLBACK(pidgin_dialogs_info_cb), _("Cancel"), NULL, - NULL, NULL, NULL, - NULL); + NULL, NULL); } static void @@ -1177,8 +1175,7 @@ fields, _("OK"), G_CALLBACK(pidgin_dialogs_log_cb), _("Cancel"), NULL, - NULL, NULL, NULL, - NULL); + NULL, NULL); } static void @@ -1201,7 +1198,7 @@ secondary, purple_buddy_get_local_alias(buddy), FALSE, FALSE, NULL, _("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb), _("Cancel"), NULL, - purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL, + purple_request_cpar_from_account(purple_buddy_get_account(buddy)), buddy); g_free(secondary); @@ -1227,7 +1224,7 @@ alias, FALSE, FALSE, NULL, _("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb), _("Cancel"), NULL, - purple_chat_get_account(chat), NULL, NULL, + purple_request_cpar_from_account(purple_chat_get_account(chat)), chat); g_free(alias); @@ -1274,7 +1271,7 @@ purple_buddy_get_name(buddy), contact_size - 1); purple_request_action(contact, NULL, _("Remove Contact"), text, 0, - NULL, purple_contact_get_alias(contact), NULL, + NULL, contact, 2, _("_Remove Contact"), G_CALLBACK(pidgin_dialogs_remove_contact_cb), _("Cancel"), @@ -1315,7 +1312,7 @@ ggp->new_name = g_strdup(new_name); purple_request_action(source, NULL, _("Merge Groups"), text, 0, - NULL, NULL, NULL, + NULL, ggp, 2, _("_Merge Groups"), G_CALLBACK(pidgin_dialogs_merge_groups_cb), _("Cancel"), G_CALLBACK(free_ggmo)); @@ -1371,7 +1368,7 @@ purple_group_get_name(group)); purple_request_action(group, NULL, _("Remove Group"), text, 0, - NULL, NULL, NULL, + NULL, group, 2, _("_Remove Group"), G_CALLBACK(pidgin_dialogs_remove_group_cb), _("Cancel"), NULL); @@ -1410,10 +1407,10 @@ purple_buddy_get_name(buddy)); purple_request_action(buddy, NULL, _("Remove Buddy"), text, 0, - purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL, - buddy, 2, - _("_Remove Buddy"), G_CALLBACK(pidgin_dialogs_remove_buddy_cb), - _("Cancel"), NULL); + purple_request_cpar_from_account( + purple_buddy_get_account(buddy)), + buddy, 2, _("_Remove Buddy"), + G_CALLBACK(pidgin_dialogs_remove_buddy_cb), _("Cancel"), NULL); g_free(text); } @@ -1437,10 +1434,9 @@ name ? name : ""); purple_request_action(chat, NULL, _("Remove Chat"), text, 0, - purple_chat_get_account(chat), NULL, NULL, - chat, 2, - _("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb), - _("Cancel"), NULL); + purple_request_cpar_from_account(purple_chat_get_account(chat)), + chat, 2, _("_Remove Chat"), + G_CALLBACK(pidgin_dialogs_remove_chat_cb), _("Cancel"), NULL); g_free(text); }