Mercurial > pidgin.yaz
changeset 21953:ad10d20bf0f4
merge of '09b67b44dabe98093e6dc706c0d731212e129a79'
and 'fb375dc299f22214e1d15477b0df15409d5362e1'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sun, 30 Dec 2007 10:06:58 +0000 |
| parents | d357ce994bd6 (current diff) 93e2caaa37ac (diff) |
| children | 02153fd5a092 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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; }