"main_menu.[ch]" -> "menus.[ch]"; it handles not only the main menu, but

context menus.

Note why we have an empty hex dump pane context menu.

svn path=/trunk/; revision=28794

18 files changed, 32 insertions, 25 deletions

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index b1ed8913cd..4ff9b3c291 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -80,7 +80,7 @@ WIRESHARK_GTK_SRC = \
 	main.c		\
 	main_airpcap_toolbar.c	\
 	main_filter_toolbar.c	\
-	main_menu.c		\
+	menus.c		\
 	main_packet_list.c	\
 	main_proto_draw.c	\
 	main_statusbar.c		\
@@ -257,7 +257,7 @@ noinst_HEADERS = \
 	main.h		\
 	main_airpcap_toolbar.h	\
 	main_filter_toolbar.h	\
-	main_menu.h		\
+	menus.h		\
 	main_packet_list.h	\
 	main_proto_draw.h	\
 	main_statusbar.h		\
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 7d7d008826..1d1a1ce9ee 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -35,8 +35,8 @@
 #include <string.h>
 #if 0
 /*
- * main_menu.h uses FILE, but I guess <stdio.h> is included by
- * something else before main_menu.h is included.
+ * menus.h uses FILE, but I guess <stdio.h> is included by
+ * something else before menus.h is included.
  */
 #include <stdio.h>
 #endif
@@ -57,7 +57,7 @@
 #include "../ringbuffer.h"
 
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/gui_utils.h"
 #include "gtk/capture_dlg.h"
 #include "gtk/filter_dlg.h"
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index 81a7873070..b4b472ecff 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -58,7 +58,7 @@
 #include "gtk/capture_file_dlg.h"
 #include "gtk/drag_and_drop.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/recent.h"
 #include "gtk/color_dlg.h"
 #ifdef HAVE_LIBPCAP
diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 8353232c45..1e43326aa3 100644
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -48,7 +48,7 @@
 #include "gtk/capture_file_dlg.h"
 #include "gtk/drag_and_drop.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #ifdef HAVE_LIBPCAP
 #include "gtk/capture_globals.h"
 #endif
diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c
index 0a8d6db606..fbe2f64577 100644
--- a/gtk/file_dlg_win32.c
+++ b/gtk/file_dlg_win32.c
@@ -60,7 +60,7 @@
 #include "gtk/file_dlg.h"
 #include "gtk/capture_file_dlg.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/drag_and_drop.h"
 #include "gtk/capture_dlg.h"
 #include "gtk/file_dlg_win32.h"
diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 3f51939e88..07ba5e9611 100644
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -43,7 +43,7 @@
 #include "gtk/gui_utils.h"
 #include "gtk/dlg_utils.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/help_dlg.h"
 #include "gtk/fileset_dlg.h"
 
diff --git a/gtk/main.c b/gtk/main.c
index 825f220df9..bb4eab8891 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -128,7 +128,7 @@
 #include "gtk/main.h"
 #include "gtk/main_airpcap_toolbar.h"
 #include "gtk/main_filter_toolbar.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/main_packet_list.h"
 #include "gtk/main_statusbar.h"
 #include "gtk/main_statusbar_private.h"
diff --git a/gtk/main.h b/gtk/main.h
index af9d01c9fb..5dafbf2e19 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -37,7 +37,7 @@
   digraph main_dependencies {
       node [shape=record, fontname=Helvetica, fontsize=10];
       main [ label="main window" URL="\ref main.h"];
-      menu [ label="menubar" URL="\ref main_menu.h"];
+      menu [ label="menubar" URL="\ref menus.h"];
       toolbar [ label="toolbar" URL="\ref toolbar.h"];
       packet_list [ label="packet list pane" URL="\ref main_packet_list.h"];
       proto_draw [ label="packet details & bytes panes" URL="\ref main_proto_draw.h"];
diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c
index ee941eed37..c6c5f51406 100644
--- a/gtk/main_filter_toolbar.c
+++ b/gtk/main_filter_toolbar.c
@@ -45,7 +45,7 @@
 #include "recent.h"
 
 #include "main.h"
-#include "main_menu.h"
+#include "menus.h"
 #include "main_toolbar.h"
 #include "main_filter_toolbar.h"
 
diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c
index bc585ce254..ab41c902f0 100644
--- a/gtk/main_packet_list.c
+++ b/gtk/main_packet_list.c
@@ -50,7 +50,7 @@
 #include "gtk/packet_history.h"
 #include "gtk/recent.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/main_packet_list.h"
 #include "gtk/main_statusbar.h"
 #include "gtk/packet_win.h"
diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c
index ba7d668615..83f29145c5 100644
--- a/gtk/main_proto_draw.c
+++ b/gtk/main_proto_draw.c
@@ -68,7 +68,7 @@
 #include "gtk/font_utils.h"
 #include "gtk/webbrowser.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/main_proto_draw.h"
 
 #if _WIN32
diff --git a/gtk/main_toolbar.c b/gtk/main_toolbar.c
index 7a2e45809d..0994171995 100644
--- a/gtk/main_toolbar.c
+++ b/gtk/main_toolbar.c
@@ -50,7 +50,7 @@
 #include "gtk/color_dlg.h"
 #include "gtk/prefs_dlg.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/main_packet_list.h"
 #include "gtk/main_toolbar.h"
 #include "gtk/help_dlg.h"
diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index f49f7df6dd..4a8523141c 100644
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -47,7 +47,7 @@
 #include "gtk/recent.h"
 #include "gtk/gtkglobals.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/main_welcome.h"
 #include "gtk/capture_dlg.h"
 #include "gtk/capture_if_dlg.h"
diff --git a/gtk/main_menu.c b/gtk/menus.c
index 187cf492c7..4cdb10c9a7 100644
--- a/gtk/main_menu.c
+++ b/gtk/menus.c
@@ -1,5 +1,5 @@
-/* main_menu.c
- * Main menu routines
+/* menus.c
+ * Menu routines
  *
  * $Id$
  *
@@ -87,7 +87,7 @@
 #include "gtk/export_object.h"
 #include "gtk/gui_stat_menu.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/main_packet_list.h"
 #include "gtk/main_toolbar.h"
 #include "gtk/main_welcome.h"
@@ -1155,7 +1155,7 @@ menus_init(void) {
     if (initialize) {
         initialize = FALSE;
 
-    /* popup */
+    /* packet list pop-up menu */
     packet_list_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
     popup_menu_object = gtk_menu_new();
     gtk_item_factory_create_items_ac(packet_list_menu_factory, sizeof(packet_list_menu_items)/sizeof(packet_list_menu_items[0]), packet_list_menu_items, popup_menu_object, 2);
@@ -1163,16 +1163,23 @@ menus_init(void) {
                     packet_list_menu_factory->widget);
     popup_menu_list = g_slist_append((GSList *)popup_menu_list, packet_list_menu_factory);
 
+    /* packet detail pop-up menu */
     tree_view_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
     gtk_item_factory_create_items_ac(tree_view_menu_factory, sizeof(tree_view_menu_items)/sizeof(tree_view_menu_items[0]), tree_view_menu_items, popup_menu_object, 2);
     g_object_set_data(G_OBJECT(popup_menu_object), PM_TREE_VIEW_KEY,
                     tree_view_menu_factory->widget);
     popup_menu_list = g_slist_append((GSList *)popup_menu_list, tree_view_menu_factory);
 
+    /*
+     * Hex dump pop-up menu.
+     * We provide our own empty menu to suppress the default pop-up menu
+     * for text widgets.
+     */
     hexdump_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
     g_object_set_data(G_OBJECT(popup_menu_object), PM_HEXDUMP_KEY,
                     hexdump_menu_factory->widget);
     popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory);
+
     /* main */
     main_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp);
     gtk_item_factory_create_items_ac(main_menu_factory, nmenu_items, menu_items, NULL, 2);
diff --git a/gtk/main_menu.h b/gtk/menus.h
index 359941cce8..8a4d990b2c 100644
--- a/gtk/main_menu.h
+++ b/gtk/menus.h
@@ -1,5 +1,5 @@
-/* main_menu.h
- * Main menu definitions
+/* menus.h
+ * Menu definitions
  *
  * $Id$
  *
diff --git a/gtk/packet_history.c b/gtk/packet_history.c
index b26d460c0a..c558fcfca1 100644
--- a/gtk/packet_history.c
+++ b/gtk/packet_history.c
@@ -33,7 +33,7 @@
 #include "../file.h"
 #include "../globals.h"
 
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/packet_history.h"
 
 
diff --git a/gtk/prefs_nameres.c b/gtk/prefs_nameres.c
index 7131c08d00..b3f8aaa28e 100644
--- a/gtk/prefs_nameres.c
+++ b/gtk/prefs_nameres.c
@@ -39,7 +39,7 @@
 #include "gtk/prefs_dlg.h"
 #include "gtk/gui_utils.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 
 
 #define M_RESOLVE_KEY	"m_resolve"
diff --git a/gtk/recent.c b/gtk/recent.c
index 917fb29bb5..1ac34d5fbe 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -44,7 +44,7 @@
 
 #include "gtk/recent.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/gui_utils.h"
 #include "gtk/main_packet_list.h"
 #include "gtk/file_dlg.h"