comparison finch/gntaccount.c @ 21099:51cf02dbdb0e

disapproval of revision 'c484d979c4fda4433a9633ff8b69bd8a395c9479'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:30:03 +0000
parents cab348e39751
children fcb848b2d669
comparison
equal deleted inserted replaced
21095:cab348e39751 21099:51cf02dbdb0e
630 return; 630 return;
631 631
632 prompt = g_strdup_printf(_("Are you sure you want to delete %s?"), 632 prompt = g_strdup_printf(_("Are you sure you want to delete %s?"),
633 purple_account_get_username(account)); 633 purple_account_get_username(account));
634 634
635 purple_request_action_with_hint(account, _("Delete Account"), prompt, NULL, 0, 635 purple_request_action(account, _("Delete Account"), prompt, NULL, 0,
636 account, NULL, NULL, "accounts", account, 2, 636 account, NULL, NULL, account, 2,
637 _("Delete"), really_delete_account, 637 _("Delete"), really_delete_account,
638 _("Cancel"), NULL); 638 _("Cancel"), NULL);
639 g_free(prompt); 639 g_free(prompt);
640 } 640 }
641 641
879 data->account = account; 879 data->account = account;
880 data->username = g_strdup(remote_user); 880 data->username = g_strdup(remote_user);
881 data->alias = (alias != NULL ? g_strdup(alias) : NULL); 881 data->alias = (alias != NULL ? g_strdup(alias) : NULL);
882 882
883 buffer = make_info(account, gc, remote_user, id, alias, msg); 883 buffer = make_info(account, gc, remote_user, id, alias, msg);
884 purple_request_action_with_hint(NULL, NULL, _("Add buddy to your list?"), 884 purple_request_action(NULL, NULL, _("Add buddy to your list?"),
885 buffer, PURPLE_DEFAULT_ACTION_NONE, 885 buffer, PURPLE_DEFAULT_ACTION_NONE,
886 account, remote_user, NULL, 886 account, remote_user, NULL,
887 "blist", data, 2, 887 data, 2,
888 _("Add"), G_CALLBACK(add_user_cb), 888 _("Add"), G_CALLBACK(add_user_cb),
889 _("Cancel"), G_CALLBACK(free_add_user_data)); 889 _("Cancel"), G_CALLBACK(free_add_user_data));
890 g_free(buffer); 890 g_free(buffer);
891 } 891 }
892 892
967 967
968 uihandle = gnt_vwindow_new(FALSE); 968 uihandle = gnt_vwindow_new(FALSE);
969 gnt_box_set_title(GNT_BOX(uihandle), _("Authorize buddy?")); 969 gnt_box_set_title(GNT_BOX(uihandle), _("Authorize buddy?"));
970 gnt_box_set_pad(GNT_BOX(uihandle), 0); 970 gnt_box_set_pad(GNT_BOX(uihandle), 0);
971 971
972 widget = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL, 972 widget = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
973 PURPLE_DEFAULT_ACTION_NONE, 973 PURPLE_DEFAULT_ACTION_NONE,
974 account, remote_user, NULL, 974 account, remote_user, NULL,
975 "blist", aa, 2, 975 aa, 2,
976 _("Authorize"), authorize_and_add_cb, 976 _("Authorize"), authorize_and_add_cb,
977 _("Deny"), deny_no_add_cb); 977 _("Deny"), deny_no_add_cb);
978 gnt_screen_release(widget); 978 gnt_screen_release(widget);
979 gnt_box_set_toplevel(GNT_BOX(widget), FALSE); 979 gnt_box_set_toplevel(GNT_BOX(widget), FALSE);
980 gnt_box_add_widget(GNT_BOX(uihandle), widget); 980 gnt_box_add_widget(GNT_BOX(uihandle), widget);
994 gnt_box_add_widget(GNT_BOX(uihandle), widget); 994 gnt_box_add_widget(GNT_BOX(uihandle), widget);
995 gnt_widget_show(uihandle); 995 gnt_widget_show(uihandle);
996 996
997 g_signal_connect_swapped(G_OBJECT(uihandle), "destroy", G_CALLBACK(free_auth_and_add), aa); 997 g_signal_connect_swapped(G_OBJECT(uihandle), "destroy", G_CALLBACK(free_auth_and_add), aa);
998 } else { 998 } else {
999 uihandle = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL, 999 uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
1000 PURPLE_DEFAULT_ACTION_NONE, 1000 PURPLE_DEFAULT_ACTION_NONE,
1001 account, remote_user, NULL, 1001 account, remote_user, NULL,
1002 "blist", user_data, 2, 1002 user_data, 2,
1003 _("Authorize"), auth_cb, 1003 _("Authorize"), auth_cb,
1004 _("Deny"), deny_cb); 1004 _("Deny"), deny_cb);
1005 } 1005 }
1006 g_free(buffer); 1006 g_free(buffer);
1007 return uihandle; 1007 return uihandle;