comparison: pidgin/gtkblist.c
pidgin/gtkblist.c
- changeset 21171
- c6934783d152
- parent 21170
- dca0f95d34ec
- child 21172
- 97f1a22adfcf
- child 21174
- 8ba833993a11
- child 21176
- e0eadd6c3db5
equal
deleted
inserted
replaced
| 21170:dca0f95d34ec | 21171:c6934783d152 |
|---|---|
| 520 g_free(a); | 520 g_free(a); |
| 521 | 521 |
| 522 if (i > 1) | 522 if (i > 1) |
| 523 { | 523 { |
| 524 char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); | 524 char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); |
| 525 purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " | 525 purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " |
| 526 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, | 526 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, |
| 527 "blist", merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); | 527 merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); |
| 528 g_free(msg); | 528 g_free(msg); |
| 529 } else | 529 } else |
| 530 g_list_free(merges); | 530 g_list_free(merges); |
| 531 } | 531 } |
| 532 | 532 |
| 4321 primary = g_strdup_printf(_("%s disconnected"), | 4321 primary = g_strdup_printf(_("%s disconnected"), |
| 4322 purple_account_get_username(account)); | 4322 purple_account_get_username(account)); |
| 4323 text = g_hash_table_lookup(gtkblist->connection_errors, account); | 4323 text = g_hash_table_lookup(gtkblist->connection_errors, account); |
| 4324 | 4324 |
| 4325 enabled = purple_account_get_enabled(account, purple_core_get_ui()); | 4325 enabled = purple_account_get_enabled(account, purple_core_get_ui()); |
| 4326 purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2, | 4326 purple_request_action(account, _("Connection Error"), primary, text, 2, |
| 4327 account, NULL, NULL, | 4327 account, NULL, NULL, |
| 4328 "account", account, 3, | 4328 account, 3, |
| 4329 _("OK"), NULL, | 4329 _("OK"), NULL, |
| 4330 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), | 4330 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), |
| 4331 enabled ? _("Connect") : _("Re-enable Account"), | 4331 enabled ? _("Connect") : _("Re-enable Account"), |
| 4332 enabled ? PURPLE_CALLBACK(purple_account_connect) : | 4332 enabled ? PURPLE_CALLBACK(purple_account_connect) : |
| 4333 PURPLE_CALLBACK(ce_enable_account_cb)); | 4333 PURPLE_CALLBACK(ce_enable_account_cb)); |
| 6269 } | 6269 } |
| 6270 | 6270 |
| 6271 static void | 6271 static void |
| 6272 pidgin_blist_request_add_group(void) | 6272 pidgin_blist_request_add_group(void) |
| 6273 { | 6273 { |
| 6274 purple_request_input_with_hint(NULL, _("Add Group"), NULL, | 6274 purple_request_input(NULL, _("Add Group"), NULL, |
| 6275 _("Please enter the name of the group to be added."), | 6275 _("Please enter the name of the group to be added."), |
| 6276 NULL, FALSE, FALSE, NULL, | 6276 NULL, FALSE, FALSE, NULL, |
| 6277 _("Add"), G_CALLBACK(add_group_cb), | 6277 _("Add"), G_CALLBACK(add_group_cb), |
| 6278 _("Cancel"), NULL, | 6278 _("Cancel"), NULL, |
| 6279 NULL, NULL, NULL, | 6279 NULL, NULL, NULL, |
| 6280 "blist", NULL); | 6280 NULL); |
| 6281 } | 6281 } |
| 6282 | 6282 |
| 6283 void | 6283 void |
| 6284 pidgin_blist_toggle_visibility() | 6284 pidgin_blist_toggle_visibility() |
| 6285 { | 6285 { |
