changeset
merge of '7bf6baddaf97b6392b6b5d199c967136c70d2a4a'
Sun, 30 Dec 2007 10:06:58 +0000
- author
- Evan Schoenberg <evands@pidgin.im>
- date
- Sun, 30 Dec 2007 10:06:58 +0000
- changeset 22094
- 8be1cf9a5fbd
- parent 22077
- 7bf6baddaf97 (current diff)
- parent 22079
- fb6de214b8ce (diff)
- child 22095
- ffb4f0d4a247
merge of '7bf6baddaf97b6392b6b5d199c967136c70d2a4a'
and 'fb6de214b8ce9996560853dcb918b8b4d7011668'
--- 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
--- 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; }
