Move capture_globals.h from ui/gtk/ to ui/. Show interface activity

using sparklines in the qtshark main window.

svn path=/trunk/; revision=44253

10 files changed, 23 insertions, 50 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index beab15e6f0..4d66a54866 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -46,6 +46,7 @@
 #include "../capture_ui_utils.h"
 #include "../ringbuffer.h"
 
+#include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "ui/recent.h"
 #include "ui/recent_utils.h"
@@ -61,7 +62,6 @@
 #include "ui/gtk/capture_file_dlg.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/capture_globals.h"
 #include "ui/gtk/cfilter_combo_utils.h"
 #include "ui/gtk/capture_if_dlg.h"
 #include "ui/gtk/main_welcome.h"
diff --git a/ui/gtk/capture_globals.h b/ui/gtk/capture_globals.h
deleted file mode 100644
index 341b081a4b..0000000000
--- a/ui/gtk/capture_globals.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* capture_globals.h
- * Capture-related globals.
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __CAPTURE_GLOBALS_H__
-#define __CAPTURE_GLOBALS_H__
-
-extern capture_options global_capture_opts;
-
-#endif /* __CAPTURE_GLOBALS_H__ */
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index f59ac82fab..afbf787968 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -41,6 +41,7 @@
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>
 
+#include "ui/capture_globals.h"
 #include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
@@ -59,7 +60,6 @@
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/webbrowser.h"
-#include "ui/gtk/capture_globals.h"
 #include "ui/gtk/network_icons.h"
 #include "ui/gtk/pipe_icon.h"
 #include "ui/gtk/main_welcome.h"
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index e3cb642880..90811ed18b 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -39,6 +39,9 @@
 #include "../capture.h"
 #endif
 
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_globals.h"
+#endif
 #include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 
@@ -46,9 +49,6 @@
 #include "ui/gtk/capture_file_dlg.h"
 #include "ui/gtk/drag_and_drop.h"
 #include "ui/gtk/main.h"
-#ifdef HAVE_LIBPCAP
-#include "ui/gtk/capture_globals.h"
-#endif
 
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/gtk/gtk_iface_monitor.c b/ui/gtk/gtk_iface_monitor.c
index 99aaa4e95a..64508e77f1 100644
--- a/ui/gtk/gtk_iface_monitor.c
+++ b/ui/gtk/gtk_iface_monitor.c
@@ -36,9 +36,9 @@
 
 #include "capture_opts.h"
 
+#include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 
-#include "ui/gtk/capture_globals.h"
 #include "ui/gtk/capture_dlg.h"
 
 GIOChannel *iface_mon_channel;
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 22cb36830a..6c90932a91 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -112,22 +112,23 @@
 #include "ui/ui_util.h"
 
 #ifdef HAVE_LIBPCAP
+#include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #endif
 
 #include <wsutil/file_util.h>
 
 #ifdef HAVE_LIBPCAP
-#include "../capture_ui_utils.h"
-#include "../capture-pcap-util.h"
-#include "../capture_ifinfo.h"
-#include "../capture.h"
-#include "../capture_sync.h"
+#include "capture_ui_utils.h"
+#include "capture-pcap-util.h"
+#include "capture_ifinfo.h"
+#include "capture.h"
+#include "capture_sync.h"
 #endif
 
 #ifdef _WIN32
-#include "../capture-wpcap.h"
-#include "../capture_wpcap_packet.h"
+#include "capture-wpcap.h"
+#include "capture_wpcap_packet.h"
 #include <tchar.h> /* Needed for Unicode */
 #include <wsutil/unicode-utils.h>
 #include <commctrl.h>
@@ -169,7 +170,6 @@
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
-#include "ui/gtk/capture_globals.h"
 #include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/prefs_column.h"
 #include "ui/gtk/prefs_dlg.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index fc992e968e..0008a50f51 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -116,7 +116,7 @@
 
 #ifdef HAVE_LIBPCAP
 #include "capture_opts.h"
-#include "ui/gtk/capture_globals.h"
+#include "ui/capture_globals.h"
 #endif
 #ifdef HAVE_IGE_MAC_INTEGRATION
 #include <ige-mac-menu.h>
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 2ea1595920..8e51d9a41d 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -41,7 +41,10 @@
 
 #include <wsutil/file_util.h>
 
+#ifdef HAVE_LIBPCAP
 #include "ui/iface_lists.h"
+#include "ui/capture_globals.h"
+#endif
 #include "ui/recent.h"
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
@@ -58,7 +61,6 @@
 #ifdef HAVE_LIBPCAP
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
-#include "ui/gtk/capture_globals.h"
 #if GTK_CHECK_VERSION(2,18,0)
 #include "ui/gtk/webbrowser.h"
 #endif
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index 6463385405..6257aeee6e 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -33,16 +33,17 @@
 
 #include <epan/prefs.h>
 
+#include "capture_opts.h"
+#include "capture_ifinfo.h"
+#include "capture_ui_utils.h"
+#include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "ui/simple_dialog.h"
-#include "../capture_ifinfo.h"
-#include "../capture_ui_utils.h"
 
 #include "ui/gtk/prefs_capture.h"
 #include "ui/gtk/prefs_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/capture_globals.h"
 #include "ui/gtk/main_welcome.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/stock_icons.h"
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index 0c3e93426c..a0184502e0 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -41,7 +41,7 @@
 #include "../capture-pcap-util.h"
 #ifdef HAVE_LIBPCAP
 #include "../capture.h"
-#include "ui/gtk/capture_globals.h"
+#include "ui/capture_globals.h"
 #endif
 #include "ui/gtk/main.h"
 #include "ui/gtk/summary_dlg.h"