aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/menu.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2007-12-21 22:22:19 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2007-12-21 22:22:19 +0000
commit789d4770d5e9b2ddf7d796a460e5bd6218522517 (patch)
tree47c8612da3f22cf2552ba1f55bbe24153866bd36 /gtk/menu.c
parentc5239888fc812267484488e85dd57597e57179ec (diff)
Fix menu sensitivity even for text only nodes.
svn path=/trunk/; revision=23936
Diffstat (limited to 'gtk/menu.c')
-rw-r--r--gtk/menu.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk/menu.c b/gtk/menu.c
index b9c89125c2..6df8c26ace 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -2812,23 +2812,16 @@ void
set_menus_for_selected_tree_row(capture_file *cf)
{
gboolean properties;
-#if 0
gint id;
-#endif
-
if (cf->finfo_selected != NULL) {
header_field_info *hfinfo = cf->finfo_selected->hfinfo;
if (hfinfo->parent == -1) {
properties = prefs_is_registered_protocol(hfinfo->abbrev);
-#if 0
- id = proto_get_id((protocol_t *)hfinfo->strings);
-#endif
+ id = (hfinfo->type == FT_PROTOCOL) ? proto_get_id((protocol_t *)hfinfo->strings) : -1;
} else {
properties = prefs_is_registered_protocol(proto_registrar_get_abbrev(hfinfo->parent));
-#if 0
id = hfinfo->parent;
-#endif
}
set_menu_sensitivity(main_menu_factory,
"/File/Export/Selected Packet Bytes...", TRUE);
@@ -2854,10 +2847,8 @@ set_menus_for_selected_tree_row(capture_file *cf)
proto_can_match_selected(cf->finfo_selected, cf->edt));
set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...",
properties);
-#if 0
set_menu_sensitivity(tree_view_menu_factory, "/Disable Protocol...",
- proto_can_toggle_protocol(id));
-#endif
+ (id == -1) ? FALSE : proto_can_toggle_protocol(id));
set_menu_sensitivity(main_menu_factory, "/View/Expand Subtrees", cf->finfo_selected->tree_type != -1);
set_menu_sensitivity(tree_view_menu_factory, "/Expand Subtrees", cf->finfo_selected->tree_type != -1);
set_menu_sensitivity(tree_view_menu_factory, "/Wiki Protocol Page",