Mercurial > pidgin
comparison finch/gntaccount.c @ 16439:08db93bbd798
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Thu, 26 Apr 2007 12:25:49 +0000 |
parents | 0f0832c13fcb |
children | 4b6d81d26b56 |
comparison
equal
deleted
inserted
replaced
16435:a46a0362dc34 | 16439:08db93bbd798 |
---|---|
610 | 610 |
611 prompt = g_strdup_printf(_("Are you sure you want to delete %s?"), | 611 prompt = g_strdup_printf(_("Are you sure you want to delete %s?"), |
612 purple_account_get_username(account)); | 612 purple_account_get_username(account)); |
613 | 613 |
614 purple_request_action(account, _("Delete Account"), prompt, NULL, 0, account, 2, | 614 purple_request_action(account, _("Delete Account"), prompt, NULL, 0, account, 2, |
615 _("Delete"), really_delete_account, _("Cancel"), NULL); | 615 _("Delete"), really_delete_account, _("Cancel"), |
616 account, NULL, NULL, | |
617 NULL); | |
616 g_free(prompt); | 618 g_free(prompt); |
617 } | 619 } |
618 | 620 |
619 static void | 621 static void |
620 account_toggled(GntWidget *widget, void *key, gpointer null) | 622 account_toggled(GntWidget *widget, void *key, gpointer null) |
827 data->username = g_strdup(remote_user); | 829 data->username = g_strdup(remote_user); |
828 data->alias = (alias != NULL ? g_strdup(alias) : NULL); | 830 data->alias = (alias != NULL ? g_strdup(alias) : NULL); |
829 | 831 |
830 buffer = make_info(account, gc, remote_user, id, alias, msg); | 832 buffer = make_info(account, gc, remote_user, id, alias, msg); |
831 purple_request_action(NULL, NULL, _("Add buddy to your list?"), | 833 purple_request_action(NULL, NULL, _("Add buddy to your list?"), |
832 buffer, PURPLE_DEFAULT_ACTION_NONE, data, 2, | 834 buffer, PURPLE_DEFAULT_ACTION_NONE, |
835 account, remote_user, NULL, | |
836 data, 2, | |
833 _("Add"), G_CALLBACK(add_user_cb), | 837 _("Add"), G_CALLBACK(add_user_cb), |
834 _("Cancel"), G_CALLBACK(free_add_user_data)); | 838 _("Cancel"), G_CALLBACK(free_add_user_data)); |
835 g_free(buffer); | 839 g_free(buffer); |
836 } | 840 } |
837 | 841 |
899 aa->data = user_data; | 903 aa->data = user_data; |
900 aa->username = g_strdup(remote_user); | 904 aa->username = g_strdup(remote_user); |
901 aa->alias = g_strdup(alias); | 905 aa->alias = g_strdup(alias); |
902 aa->account = account; | 906 aa->account = account; |
903 uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL, | 907 uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL, |
904 PURPLE_DEFAULT_ACTION_NONE, aa, 2, | 908 PURPLE_DEFAULT_ACTION_NONE, |
909 account, remote_user, NULL, | |
910 aa, 2, | |
905 _("Authorize"), authorize_and_add_cb, | 911 _("Authorize"), authorize_and_add_cb, |
906 _("Deny"), deny_no_add_cb); | 912 _("Deny"), deny_no_add_cb); |
907 } else { | 913 } else { |
908 uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL, | 914 uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL, |
909 PURPLE_DEFAULT_ACTION_NONE, user_data, 2, | 915 PURPLE_DEFAULT_ACTION_NONE, |
916 account, remote_user, NULL, | |
917 user_data, 2, | |
910 _("Authorize"), auth_cb, | 918 _("Authorize"), auth_cb, |
911 _("Deny"), deny_cb); | 919 _("Deny"), deny_cb); |
912 } | 920 } |
913 g_free(buffer); | 921 g_free(buffer); |
914 return uihandle; | 922 return uihandle; |