comparison pidgin/gtkblist.c @ 21335:d4f95419be45

disapproval of revision 'b6ee8d925e8e7670de77e6283963fa151ea0ed77'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:01:12 +0000
parents a20ef7180680
children 0cb8d5304f4f
comparison
equal deleted inserted replaced
21244:a20ef7180680 21335:d4f95419be45
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_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. "
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 PURPLE_REQUEST_UI_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); 527 PURPLE_REQUEST_HINT_BLIST, 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
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_with_hint(account, _("Connection Error"), primary, text, 2,
4327 account, NULL, NULL, 4327 account, NULL, NULL,
4328 PURPLE_REQUEST_UI_HINT_ACCOUNT, account, 3, 4328 PURPLE_REQUEST_HINT_ACCOUNT, 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));
6285 _("Please enter the name of the group to be added."), 6285 _("Please enter the name of the group to be added."),
6286 NULL, FALSE, FALSE, NULL, 6286 NULL, FALSE, FALSE, NULL,
6287 _("Add"), G_CALLBACK(add_group_cb), 6287 _("Add"), G_CALLBACK(add_group_cb),
6288 _("Cancel"), NULL, 6288 _("Cancel"), NULL,
6289 NULL, NULL, NULL, 6289 NULL, NULL, NULL,
6290 PURPLE_REQUEST_UI_HINT_BLIST, NULL); 6290 PURPLE_REQUEST_HINT_BLIST, NULL);
6291 } 6291 }
6292 6292
6293 void 6293 void
6294 pidgin_blist_toggle_visibility() 6294 pidgin_blist_toggle_visibility()
6295 { 6295 {