# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1199009218 0
# Node ID ad10d20bf0f4bda41786fe7c1a3e3800d65821d3
# Parent  d357ce994bd6a79214aa268da5cf0091a05a18f2# Parent  93e2caaa37acb0b138b28366d4c4b9f50b365705
merge of '09b67b44dabe98093e6dc706c0d731212e129a79'
     and 'fb375dc299f22214e1d15477b0df15409d5362e1'

diff -r d357ce994bd6 -r ad10d20bf0f4 ChangeLog
--- a/ChangeLog	Sun Dec 30 10:06:51 2007 +0000
+++ b/ChangeLog	Sun Dec 30 10:06:58 2007 +0000
@@ -12,6 +12,8 @@
 	* Added the ability to theme conversation name colors (red and blue)
 	  through your GTK+ theme, and exposed those theme settings to the 
 	  Pidgin GTK+ Theme Control plugin (Dustin Howett)
+	* Fixed having multiple alias edit areas in the infopane (Elliott Sales de
+	  Andrade)
 
 	Finch:
 	* Color is used in the buddylist to indicate status, and the conversation
diff -r d357ce994bd6 -r ad10d20bf0f4 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun Dec 30 10:06:51 2007 +0000
+++ b/pidgin/gtkconv.c	Sun Dec 30 10:06:58 2007 +0000
@@ -8702,7 +8702,7 @@
 	PurpleConversation *conv = gtkconv->active_conv;
 	const char *text = NULL;
 
-	if (!GTK_WIDGET_VISIBLE(gtkconv->tab_label)) {
+	if (!GTK_WIDGET_VISIBLE(gtkconv->infopane)) {
 		/* There's already an entry for alias. Let's not create another one. */
 		return FALSE;
 	}