pidgin: 83238801: Make the Add Buddy dialog cause the auto...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 832388016fc893f5c5d8569130fe34914c3c4cb0
Ancestor: 72d77bee8c7f8271071848c21432141e960014a5
Author: kstange at pidgin.im
Date: 2008-06-08T22:51:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/832388016fc893f5c5d8569130fe34914c3c4cb0

Modified files:
        ChangeLog pidgin/gtkblist.c

ChangeLog: 

Make the Add Buddy dialog cause the auto-personize prompt where appropriate.

-------------- next part --------------
============================================================
--- ChangeLog	61b28c31c17f56852cc8a906fffe3c6687f6db59
+++ ChangeLog	3617bff2b4de11c52411e2999c08550f2e5cc7b9
@@ -9,10 +9,12 @@ version 2.5.0 (??/??/2008):
 	  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
============================================================
--- pidgin/gtkblist.c	73ecdfb268c811ee7dabf1bfacdf5e849df97e2d
+++ pidgin/gtkblist.c	404d09ac168cf154abd89022fd4240ad9552ffab
@@ -6474,6 +6474,10 @@ add_buddy_cb(GtkWidget *w, int resp, Pid
 		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