Mercurial > pidgin.yaz
changeset 16277:d7e385be0346
merge of 'eab57450eff9fe8f08a5a0c429d0f2727ce8d297'
and 'f723520deba5ec94d3c5eee87e935e88acf54164'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 20 Apr 2007 06:34:10 +0000 |
| parents | 31dad9806e9d (diff) 9a4854d71234 (current diff) |
| children | 70a368273778 |
| files | pidgin/pixmaps/pidgin.svg |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntblist.c Fri Apr 20 05:58:57 2007 +0000 +++ b/finch/gntblist.c Fri Apr 20 06:34:10 2007 +0000 @@ -909,6 +909,7 @@ { const char *name = NULL; char *prompt; + const char *text; if (PURPLE_BLIST_NODE_IS_CONTACT(node)) name = purple_contact_get_alias((PurpleContact*)node); @@ -923,8 +924,9 @@ prompt = g_strdup_printf(_("Please enter the new name for %s"), name); - purple_request_input(node, _("Rename"), prompt, _("Enter empty string to reset the name."), - name, FALSE, FALSE, NULL, _("Rename"), G_CALLBACK(rename_blist_node), + text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Alias"); + purple_request_input(node, text, prompt, _("Enter empty string to reset the name."), + name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node), _("Cancel"), NULL, node); g_free(prompt); @@ -1135,7 +1137,8 @@ /* These are common for everything */ if (node) { - add_custom_action(GNT_MENU(context), _("Rename"), + add_custom_action(GNT_MENU(context), + PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Alias"), PURPLE_CALLBACK(finch_blist_rename_node_cb), node); add_custom_action(GNT_MENU(context), _("Remove"), PURPLE_CALLBACK(finch_blist_remove_node_cb), node);