Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 16451:af1274975769
merge of 'd1933818a76d2d05c8161d9aa1491e1b46b6d92f'
and 'e3c852fbe4f3bb99edd59ddf1eae85c8ebbb570e'
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Thu, 26 Apr 2007 19:02:11 +0000 |
parents | 08db93bbd798 |
children | 5e47b3427b28 |
comparison
equal
deleted
inserted
replaced
16440:01c2ded5a9e3 | 16451:af1274975769 |
---|---|
3952 purple_account_get_username(account)); | 3952 purple_account_get_username(account)); |
3953 text = g_hash_table_lookup(gtkblist->connection_errors, account); | 3953 text = g_hash_table_lookup(gtkblist->connection_errors, account); |
3954 | 3954 |
3955 enabled = purple_account_get_enabled(account, purple_core_get_ui()); | 3955 enabled = purple_account_get_enabled(account, purple_core_get_ui()); |
3956 purple_request_action(account, _("Connection Error"), primary, text, 2, | 3956 purple_request_action(account, _("Connection Error"), primary, text, 2, |
3957 account, NULL, NULL, | |
3957 account, 3, | 3958 account, 3, |
3958 _("OK"), NULL, | 3959 _("OK"), NULL, |
3959 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), | 3960 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), |
3960 enabled ? _("Connect") : _("Re-enable Account"), | 3961 enabled ? _("Connect") : _("Re-enable Account"), |
3961 enabled ? PURPLE_CALLBACK(purple_account_connect) : | 3962 enabled ? PURPLE_CALLBACK(purple_account_connect) : |
5803 { | 5804 { |
5804 purple_request_input(NULL, _("Add Group"), NULL, | 5805 purple_request_input(NULL, _("Add Group"), NULL, |
5805 _("Please enter the name of the group to be added."), | 5806 _("Please enter the name of the group to be added."), |
5806 NULL, FALSE, FALSE, NULL, | 5807 NULL, FALSE, FALSE, NULL, |
5807 _("Add"), G_CALLBACK(add_group_cb), | 5808 _("Add"), G_CALLBACK(add_group_cb), |
5808 _("Cancel"), NULL, NULL); | 5809 _("Cancel"), NULL, |
5810 NULL, NULL, NULL, | |
5811 NULL); | |
5809 } | 5812 } |
5810 | 5813 |
5811 void | 5814 void |
5812 pidgin_blist_toggle_visibility() | 5815 pidgin_blist_toggle_visibility() |
5813 { | 5816 { |