Mercurial > pidgin
changeset 15555:0c61cd8e5898
merge of '0cdb5a41899b72694b4b3e0d18af5185cec3dc30'
and '3ed56e9c270c468fd082f614356c1bdb7f420f56'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sun, 04 Feb 2007 21:14:41 +0000 |
| parents | d5242ff0708b (current diff) 883bf81c8d73 (diff) |
| children | 00fa07da4175 0b5db3387ded |
| files | pidgin/gtkconv.c pidgin/gtkgaim.h pidgin/pixmaps/emblems/16/message-pending.png pidgin/pixmaps/emblems/16/scalable/message-pending.svg pidgin/pixmaps/status/16/invisible.png |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Feb 04 21:14:34 2007 +0000 +++ b/pidgin/gtkconv.c Sun Feb 04 21:14:41 2007 +0000 @@ -5693,6 +5693,7 @@ gtk_widget_show(win->menu.invite); gtk_widget_show(win->menu.alias); gtk_widget_hide(win->menu.block); + gtk_widget_hide(win->menu.unblock); gtk_widget_hide(win->menu.show_icon); if ((account == NULL) || gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) == NULL) {