Mercurial > pidgin
comparison finch/gntaccount.c @ 21244:a20ef7180680
Re-namespace the #defines to all be PURPLE_REQUEST_UI_HINT_*. I see no
reason that the common UI ones need to be in a different namespace from the
ones used by libpurple.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 20:53:40 +0000 |
parents | fba1f6c3df0b |
children | d4f95419be45 dccfd999ffe7 |
comparison
equal
deleted
inserted
replaced
21243:6402252be3c8 | 21244:a20ef7180680 |
---|---|
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_with_hint(account, _("Delete Account"), prompt, NULL, 0, |
636 account, NULL, NULL, PURPLE_UI_REQUEST_HINT_ACCOUNTMGR, account, 2, | 636 account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, 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 |
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_with_hint(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 PURPLE_REQUEST_HINT_BLIST, data, 2, | 887 PURPLE_REQUEST_UI_HINT_BLIST, 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 |
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_with_hint(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 PURPLE_REQUEST_HINT_BLIST, aa, 2, | 975 PURPLE_REQUEST_UI_HINT_BLIST, 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); |
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_with_hint(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 PURPLE_REQUEST_HINT_BLIST, user_data, 2, | 1002 PURPLE_REQUEST_UI_HINT_BLIST, 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; |