# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1142628564 0
# Node ID 9713baaa9aa6e78245df43555e71071bbfc53399
# Parent  5ddae6fe983e3815fab7f429f2b47816e11ebe8a
[gaim-migrate @ 15899]
With the core doing fallback blocking, we should always be able to choose Block from the conversation menu.

committer: Tailor Script <tailor@pidgin.im>

diff -r 5ddae6fe983e -r 9713baaa9aa6 src/gtkconv.c
--- a/src/gtkconv.c	Fri Mar 17 05:45:48 2006 +0000
+++ b/src/gtkconv.c	Fri Mar 17 20:49:24 2006 +0000
@@ -5460,7 +5460,6 @@
 		gtk_widget_set_sensitive(win->menu.add_pounce, TRUE);
 		gtk_widget_set_sensitive(win->menu.get_info, (prpl_info->get_info != NULL));
 		gtk_widget_set_sensitive(win->menu.invite, (prpl_info->chat_invite != NULL));
-		gtk_widget_set_sensitive(win->menu.block, (prpl_info->add_deny != NULL));
 		gtk_widget_set_sensitive(win->menu.insert_link, (conv->features & GAIM_CONNECTION_HTML));
 		gtk_widget_set_sensitive(win->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE) && !(conv->features & GAIM_CONNECTION_NO_IMAGES));
 
@@ -5502,7 +5501,6 @@
 		gtk_widget_set_sensitive(win->menu.get_info, FALSE);
 		gtk_widget_set_sensitive(win->menu.invite, FALSE);
 		gtk_widget_set_sensitive(win->menu.alias, FALSE);
-		gtk_widget_set_sensitive(win->menu.block, FALSE);
 		gtk_widget_set_sensitive(win->menu.add, FALSE);
 		gtk_widget_set_sensitive(win->menu.remove, FALSE);
 		gtk_widget_set_sensitive(win->menu.insert_link, TRUE);