Mercurial > pidgin
comparison finch/gntconn.c @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 02:13:14 +0000 |
parents | fdefa5eb46e2 |
children | 8c9aad9479c0 |
comparison
equal
deleted
inserted
replaced
21093:5e46cdf9ef2b | 21098:7e200a629109 |
---|---|
128 primary = g_strdup_printf(_("%s disconnected."), act); | 128 primary = g_strdup_printf(_("%s disconnected."), act); |
129 secondary = g_strdup_printf(_("%s\n\n" | 129 secondary = g_strdup_printf(_("%s\n\n" |
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(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 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); |