im.pidgin.pidgin: 340fc0f3d69e64b23e09bde0066f1aca103fb7bf

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 340fc0f3d69e64b23e09bde0066f1aca103fb7bf
Ancestor: 3e52790b87fa326586cadd6a1d9a4bb2fd7c3a3e
Author: sadrul at pidgin.im
Date: 2007-12-24T02:00:17
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	dd1e27bbc6ea80912f6dc297be746abbc3e6c8a8
+++ pidgin/gtkblist.c	4b0944d817e5f7c99a407bc4f6f3ad600edacbf0
@@ -535,12 +535,14 @@ gtk_blist_auto_personize(PurpleBlistNode
 			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);