Do not prompt for an already merged contact. Fixes #4285.

Mon, 24 Dec 2007 02:00:17 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Mon, 24 Dec 2007 02:00:17 +0000
changeset 22045
b1573130a0f4
parent 22044
d9e9194d9f8b
child 22046
fac856b76384

Do not prompt for an already merged contact. Fixes #4285.

pidgin/gtkblist.c file | annotate | diff | comparison | revisions
--- a/pidgin/gtkblist.c	Mon Dec 24 01:28:24 2007 +0000
+++ b/pidgin/gtkblist.c	Mon Dec 24 02:00:17 2007 +0000
@@ -535,12 +535,14 @@
 			if (node_alias && !g_utf8_collate(node_alias, a)) {
 				merges = g_list_append(merges, buddy);
 				i++;
+				g_free(node_alias);
+				break;
 			}
 			g_free(node_alias);
 		}
 	}
 	g_free(a);
-	
+
 	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);

mercurial