Start to have an generic wireless toolbar. Sligtly modified patch from

Pontus Fuchs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=43354

diff --git a/Makefile.nmake b/Makefile.nmake
index 007f7d55cacd4f8a89705acb504fd4a12aeb3677..52dd6bfa33f6dccee74a669a1248ea0091196f89 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -412,6 +412,7 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \
            -e "s/@HAVE_PYTHON@/$(PYTHON_CONFIG)/" \
            -e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \
+           -e "s/@HAVE_WIRELESS_TOOLBAR@/$(WIRELESS_TOOLBAR_CONFIG)/" \
            -e "s/@HAVE_AIRPDCAP@/$(AIRPDCAP_CONFIG)/" \
            -e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \
            -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \

diff --git a/config.h.win32 b/config.h.win32
index d66faeb8be1f005454c07853c84925062cd1a8bd..2b9c7fbecbe441a1b7f54993f6cce3538b3a7716 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -72,6 +72,7 @@
 /* #undef HAVE_PCAP_GET_SELECTABLE_FD */
 
 @HAVE_AIRPCAP@
+@HAVE_WIRELESS_TOOLBAR@
 
 @PCAP_NG_DEFAULT@
 @WANT_PACKET_EDITOR@

diff --git a/config.nmake b/config.nmake
index 1217d30ded13c81b8d0ad051668c20e190c9b5e1..030bef4f0546cfaea0d5404ea01eb8fe867b2a7f 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1132,9 +1132,11 @@ NEED_XML_DLL=USE
 
 !IFDEF AIRPCAP_DIR
 AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
+WIRELESS_TOOLBAR_CONFIG=^#define HAVE_WIRELESS_TOOLBAR 1
 #AIRPCAP_CFLAGS=/I$(AIRPCAP_DIR)\include
 !ELSE
 AIRPCAP_CONFIG=
+WIRELESS_TOOLBAR_CONFIG=
 !ENDIF
 
 !IFDEF PCAP_DIR

diff --git a/configure.in b/configure.in
index d508cb7290026fa350d1d30dfdf00959fe9a65b4..7867058c74780cb6ffd9ed6b06b642c609a2770a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1243,6 +1243,7 @@ if test x$enable_airpcap = xyes; then
        else
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
+               AC_DEFINE(HAVE_WIRELESS_TOOLBAR, 1, [Wireless Toolbar])
        fi
 else
        AC_MSG_RESULT(no)

diff --git a/recent.c b/recent.c
index 1f59b701f4e52701c12372676dd6aa5f1f43b506..87b3b11578cf9a40ea0f0005d7d29461367b91c5 100644 (file)
--- a/recent.c
+++ b/recent.c
@@ -53,7 +53,7 @@
 
 #define RECENT_KEY_MAIN_TOOLBAR_SHOW        "gui.toolbar_main_show"
 #define RECENT_KEY_FILTER_TOOLBAR_SHOW      "gui.filter_toolbar_show"
-#define RECENT_KEY_AIRPCAP_TOOLBAR_SHOW     "gui.airpcap_toolbar_show"
+#define RECENT_KEY_WIRELESS_TOOLBAR_SHOW    "gui.wireless_toolbar_show"
 #define RECENT_KEY_DRIVER_CHECK_SHOW        "gui.airpcap_driver_check_show"
 #define RECENT_KEY_PACKET_LIST_SHOW         "gui.packet_list_show"
 #define RECENT_KEY_TREE_VIEW_SHOW           "gui.tree_view_show"
@@ -305,12 +305,10 @@ write_profile_recent(void)
   fprintf(rf, RECENT_KEY_FILTER_TOOLBAR_SHOW ": %s\n",
                  recent.filter_toolbar_show == TRUE ? "TRUE" : "FALSE");
 
-#ifdef HAVE_AIRPCAP
   fprintf(rf, "\n# Wireless Settings Toolbar show (hide).\n");
   fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_AIRPCAP_TOOLBAR_SHOW ": %s\n",
-                 recent.airpcap_toolbar_show == TRUE ? "TRUE" : "FALSE");
-#endif
+  fprintf(rf, RECENT_KEY_WIRELESS_TOOLBAR_SHOW ": %s\n",
+                 recent.wireless_toolbar_show == TRUE ? "TRUE" : "FALSE");
 
 #ifdef HAVE_AIRPCAP
   fprintf(rf, "\n# Show (hide) old AirPcap driver warning dialog box.\n");
@@ -541,19 +539,20 @@ read_set_recent_pair_static(gchar *key, gchar *value, void *private_data _U_,
     else {
         recent.main_toolbar_show = FALSE;
     }
-  } else if (strcmp(key, RECENT_KEY_FILTER_TOOLBAR_SHOW) == 0) {
+       /* check both the old ane the new keyword */
+  } else if ((strcmp(key, RECENT_KEY_FILTER_TOOLBAR_SHOW) == 0) || (strcmp(key, "gui.airpcap_toolbar_show") == 0) ) {
     if (g_ascii_strcasecmp(value, "true") == 0) {
         recent.filter_toolbar_show = TRUE;
     }
     else {
         recent.filter_toolbar_show = FALSE;
     }
-  } else if (strcmp(key, RECENT_KEY_AIRPCAP_TOOLBAR_SHOW) == 0) {
+  } else if (strcmp(key, RECENT_KEY_WIRELESS_TOOLBAR_SHOW) == 0) {
     if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.airpcap_toolbar_show = TRUE;
+        recent.wireless_toolbar_show = TRUE;
     }
     else {
-        recent.airpcap_toolbar_show = FALSE;
+        recent.wireless_toolbar_show = FALSE;
     }
   } else if (strcmp(key, RECENT_KEY_DRIVER_CHECK_SHOW) == 0) {
     if (g_ascii_strcasecmp(value, "true") == 0) {
@@ -852,7 +851,7 @@ recent_read_profile_static(char **rf_path_return, int *rf_errno_return)
   /* set defaults */
   recent.main_toolbar_show      = TRUE;
   recent.filter_toolbar_show    = TRUE;
-  recent.airpcap_toolbar_show   = FALSE;
+  recent.wireless_toolbar_show   = FALSE;
   recent.airpcap_driver_check_show   = TRUE;
   recent.packet_list_show       = TRUE;
   recent.tree_view_show         = TRUE;

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 1e580bc3ae193977c30790712707ff8ec0226c26..e113968def69d3b073ff12953dab2a556e203bab 100644 (file)
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -3631,13 +3631,11 @@ main_widgets_show_or_hide(void)
         gtk_widget_hide(filter_tb);
     }
 
-#ifdef HAVE_AIRPCAP
-    if (recent.airpcap_toolbar_show) {
+    if (recent.wireless_toolbar_show) {
         gtk_widget_show(airpcap_tb);
     } else {
         gtk_widget_hide(airpcap_tb);
     }
-#endif
 
     if (recent.packet_list_show && have_capture_file) {
         gtk_widget_show(pkt_scrollw);

diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 379ba95bab5fb2b0be1a47b10e578a1fefc9458b..81f3ffbef9fc06d92ff79644cb79aefcbd9a4059 100644 (file)
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -148,7 +148,7 @@ static void menus_init(void);
 static void merge_lua_menu_items(GList *node);
 static void ws_menubar_build_external_menus(void);
 static void set_menu_sensitivity (GtkUIManager *ui_manager, const gchar *, gint);
-#if !defined(WANT_PACKET_EDITOR) || !defined(HAVE_AIRPCAP) || !defined(HAVE_LIBPCAP)
+#if !defined(WANT_PACKET_EDITOR) || !defined(HAVE_WIRELESS_TOOLBAR) || !defined(HAVE_LIBPCAP)
 static void set_menu_visible(GtkUIManager *ui_manager, const gchar *path, gint val);
 #endif
 static void name_resolution_cb(GtkWidget *w, gpointer d, gint action);
@@ -635,12 +635,14 @@ filter_toolbar_show_hide_cb(GtkAction * action _U_, gpointer user_data _U_)
 static void
 wireless_toolbar_show_hide_cb(GtkAction *action _U_, gpointer user_data _U_)
 {
-#ifdef HAVE_AIRPCAP
     GtkWidget *widget = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar");
 
-    recent.airpcap_toolbar_show = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
-    main_widgets_show_or_hide();
-#endif /* HAVE_AIRPCAP */
+       if(widget){
+               recent.wireless_toolbar_show = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+       }else{
+               recent.wireless_toolbar_show = FALSE;
+       }
+       main_widgets_show_or_hide();
 }
 
 static void
@@ -3507,9 +3509,7 @@ menus_init(void) {
 #ifndef WANT_PACKET_EDITOR
         set_menu_visible(ui_manager_main_menubar, "/Menubar/EditMenu/EditPacket", FALSE);
 #endif /* WANT_PACKET_EDITOR */
-#ifndef HAVE_AIRPCAP
         set_menu_visible(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar", FALSE);
-#endif /* HAVE_AIRPCAP */
 
 #ifndef HAVE_LIBPCAP
         set_menu_visible(ui_manager_main_menubar, "/Menubar/CaptureMenu", FALSE);
@@ -3879,7 +3879,7 @@ set_menu_sensitivity(GtkUIManager *ui_manager, const gchar *path, gint val)
     gtk_action_set_sensitive (action, val); /* TRUE to make the action sensitive */
 }
 
-#if !defined(WANT_PACKET_EDITOR) || !defined(HAVE_AIRPCAP) || !defined(HAVE_LIBPCAP)
+#if !defined(WANT_PACKET_EDITOR) || !defined(HAVE_WIRELESS_TOOLBAR) || !defined(HAVE_LIBPCAP)
 static void
 set_menu_visible(GtkUIManager *ui_manager, const gchar *path, gint val)
 {
@@ -4403,14 +4403,12 @@ menu_recent_read_finished(void) {
     }else{
         gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.filter_toolbar_show);
     };
-#ifdef HAVE_AIRPCAP
     menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar");
     if(!menu){
         g_warning("menu_recent_read_finished: No menu found, path= /Menubar/ViewMenu/WirelessToolbar");
     }else{
-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.airpcap_toolbar_show);
+        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.wireless_toolbar_show);
     }
-#endif /* HAVE_AIRPCAP */
 
     /* Fix me? */
     menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/StatusBar");

diff --git a/ui/recent.h b/ui/recent.h
index b58a56d6b49605b5d175e88abceb8dda144e1515..dc0b23e8e46a978ff3a08fc17cc1f5cb6c4f9a27 100644 (file)
--- a/ui/recent.h
+++ b/ui/recent.h
@@ -66,7 +66,7 @@ typedef struct _col_width_data {
 typedef struct recent_settings_tag {
     gboolean    main_toolbar_show;
     gboolean    filter_toolbar_show;
-    gboolean   airpcap_toolbar_show;
+    gboolean   wireless_toolbar_show;
     gboolean    airpcap_driver_check_show;
     gboolean    packet_list_show;
     gboolean    tree_view_show;