Mercurial > pidgin
comparison finch/gntconn.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:27:07 +0000 |
parents | d4f95419be45 73c5f5bfeb39 |
children | fcb848b2d669 |
comparison
equal
deleted
inserted
replaced
21352:ca17c133d6c3 | 21353:8ae227dca885 |
---|---|
130 "Finch will not attempt to reconnect the account until you " | 130 "Finch will not attempt to reconnect the account until you " |
131 "correct the error and re-enable the account."), text); | 131 "correct the error and re-enable the account."), text); |
132 | 132 |
133 purple_request_action_with_hint(account, NULL, primary, secondary, 2, | 133 purple_request_action_with_hint(account, NULL, primary, secondary, 2, |
134 account, NULL, NULL, | 134 account, NULL, NULL, |
135 PURPLE_REQUEST_HINT_BLIST, account, 3, | 135 "blist", account, 3, |
136 _("OK"), NULL, | 136 _("OK"), NULL, |
137 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), | 137 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), |
138 _("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb)); | 138 _("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb)); |
139 | 139 |
140 g_free(act); | 140 g_free(act); |