# HG changeset patch
# User Eoin Coffey <ecoffey@soc.pidgin.im>
# Date 1189906857 0
# Node ID 6e2bd948a897cb81dfc4fadbcdbc2d7d948a670f
# Parent  539d042c8fc6bef856c30bac973b8d90995ea4c0# Parent  90b5255f0a300fabef2923c26d370c379bbb62aa
merge of '249b00cea42025dd90023ffcffb778f320c99c99'
     and '7e7c1dcb86828e5d333f960959a5b86a4b02556e'

diff -r 539d042c8fc6 -r 6e2bd948a897 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,