# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1170623681 0
# Node ID 0c61cd8e5898cf1c3540ea353add408eded98d3b
# Parent  d5242ff0708b0729461e5bde66fac83cf3529a75# Parent  883bf81c8d736219a199cdb604fa4af2a361e0f5
merge of '0cdb5a41899b72694b4b3e0d18af5185cec3dc30'
     and '3ed56e9c270c468fd082f614356c1bdb7f420f56'

diff -r d5242ff0708b -r 0c61cd8e5898 pidgin/gtkconv.c
--- 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) {