Mercurial > pidgin.yaz
diff pidgin/gtkblist.c @ 20598:285bb637a2b7
Updated hinting to be less invasive
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Sat, 22 Sep 2007 16:19:34 +0000 |
| parents | 591267f6f1d5 |
| children | 6facfce7fa07 |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sat Sep 22 09:48:07 2007 +0000 +++ b/pidgin/gtkblist.c Sat Sep 22 16:19:34 2007 +0000 @@ -522,9 +522,9 @@ if (i > 1) { 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); - 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. " + 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. " "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, - merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); + "blist", merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); g_free(msg); } else g_list_free(merges); @@ -4315,7 +4315,7 @@ text = g_hash_table_lookup(gtkblist->connection_errors, account); enabled = purple_account_get_enabled(account, purple_core_get_ui()); - purple_request_action(account, _("Connection Error"), primary, text, 2, + purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2, account, NULL, NULL, "account", account, 3, _("OK"), NULL, @@ -6260,7 +6260,7 @@ static void pidgin_blist_request_add_group(void) { - purple_request_input(NULL, _("Add Group"), NULL, + purple_request_input_with_hint(NULL, _("Add Group"), NULL, _("Please enter the name of the group to be added."), NULL, FALSE, FALSE, NULL, _("Add"), G_CALLBACK(add_group_cb),