# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1212965489 0
# Node ID aec041e8f3e07abafbc80e015da831db91574840
# Parent  8c315f969600a5d736d218831cb554f7befe6bb6
Make the Add Buddy dialog cause the auto-personize prompt where appropriate.

diff -r 8c315f969600 -r aec041e8f3e0 ChangeLog
--- a/ChangeLog	Sun Jun 08 22:18:14 2008 +0000
+++ b/ChangeLog	Sun Jun 08 22:51:29 2008 +0000
@@ -9,10 +9,12 @@
 	  and restoring compatibility with the web messenger (Yusuke Odate)
 
 	Pidgin:
-	* Custom buddy icons can now be added and removed to buddy list
+	* Custom buddy icons can now be added to and removed from buddy list
 	  entries via the buddy list entry right-click menu.
 	* Resize large incoming custom smileys to a maximum of 96px on either
 	  side.
+	* Automatically offer to merge buddies into the same contact if the
+	  alias given matches that of existing buddies in the same group.
 
 	General:
 	* Group and Chat buddy list entries can now be given custom buddy
diff -r 8c315f969600 -r aec041e8f3e0 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sun Jun 08 22:18:14 2008 +0000
+++ b/pidgin/gtkblist.c	Sun Jun 08 22:51:29 2008 +0000
@@ -6474,6 +6474,10 @@
 		purple_blist_add_buddy(b, NULL, g, NULL);
 		purple_account_add_buddy(data->account, b);
 
+		/* Offer to merge people with the same alias. */
+		if (whoalias != NULL)
+			gtk_blist_auto_personize(g, whoalias);
+
 		/*
 		 * XXX
 		 * It really seems like it would be better if the call to