qulogic/pidgin

merge of 'ce080531de3449bfa119d6b315a92a19a0ec50a7'

2007-09-16, Eoin Coffey
8b525d903da2
Parents ce080531de34415a2e9e61b6
Children 352f79e0c38447a4ef59668b
merge of 'ce080531de3449bfa119d6b315a92a19a0ec50a7'
and '415a2e9e61b6735fe97701a604ff3e130230bb80'
1 files changed, 4 insertions(+), 2 deletions(-)
  • +4 -2
    pidgin/gtkblist.c
    • --- a/pidgin/gtkblist.c Sun Sep 16 01:40:44 2007 +0000
    +++ b/pidgin/gtkblist.c Sun Sep 16 01:40:57 2007 +0000
    @@ -488,7 +488,6 @@
    GList *merges = NULL;
    int i = 0;
    char *a = g_utf8_casefold(alias, -1);
    - char *msg;
    for (contact = group->child; contact; contact = contact->next) {
    char *node_alias;
    @@ -518,11 +517,14 @@
    }
    g_free(a);
    - msg = g_strdup_printf(ngettext("You can't merge one contact. That doesn't make any sense. You should never see this message ever", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias);
    if (i > 1)
    + {
    + char *msg = g_strdup_printf(ngettext("You currently 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. "
    "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));
    + g_free(msg);
    + }
    }
    static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1,