Mercurial > pidgin.yaz

changeset 21932:f82c94a72f5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not prompt for an already merged contact. Fixes #4285.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 24 Dec 2007 02:00:17 +0000
parents fa57a93219bf
children a368ee78a798
files pidgin/gtkblist.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);