aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/capture_dlg.c4
-rw-r--r--ui/gtk/capture_if_details_dlg_win32.c4
-rw-r--r--ui/gtk/capture_if_dlg.c6
-rw-r--r--ui/gtk/capture_if_dlg.h2
-rw-r--r--ui/gtk/capture_info_dlg.c2
-rw-r--r--ui/gtk/main.c55
-rw-r--r--ui/gtk/main_80211_toolbar.c2
-rw-r--r--ui/gtk/main_welcome.c2
-rw-r--r--ui/gtk/prefs_capture.c2
-rw-r--r--ui/gtk/prefs_dlg.c2
-rw-r--r--ui/gtk/summary_dlg.c2
11 files changed, 25 insertions, 58 deletions
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index e43d168f68..832ab4e399 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -37,8 +37,8 @@
#include <wsutil/filesystem.h>
#include "ui/capture.h"
-#include <capchild/capture_ifinfo.h>
-#include "../capture-pcap-util.h"
+#include "caputils/capture_ifinfo.h"
+#include "caputils/capture-pcap-util.h"
#include "../ringbuffer.h"
#include "ui/capture_ui_utils.h"
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
index 8c8da75bcd..55a561888b 100644
--- a/ui/gtk/capture_if_details_dlg_win32.c
+++ b/ui/gtk/capture_if_details_dlg_win32.c
@@ -56,9 +56,9 @@
#include <Ntddndis.h>
#endif
-#include "capture_win_ifnames.h"
+#include "caputils/capture_win_ifnames.h"
-#include "../capture_wpcap_packet.h"
+#include "caputils/capture_wpcap_packet.h"
/* packet32.h requires sockaddr_storage
* whether sockaddr_storage is defined or not depends on the Platform SDK
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index f9db745edc..fee1caa59a 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -33,9 +33,9 @@
#include "../capture_opts.h"
#include <capchild/capture_session.h>
-#include <capchild/capture_ifinfo.h>
+#include "caputils/capture_ifinfo.h"
#include "ui/capture.h"
-#include "../capture-pcap-util.h"
+#include "caputils/capture-pcap-util.h"
#include "wsutil/file_util.h"
#include <wiretap/wtap.h>
@@ -46,7 +46,7 @@
#ifdef _WIN32
#include "ui/gtk/capture_if_details_dlg_win32.h"
-#include "../../capture-wpcap.h"
+#include "caputils/capture-wpcap.h"
#endif
#include "ui/gtk/stock_icons.h"
diff --git a/ui/gtk/capture_if_dlg.h b/ui/gtk/capture_if_dlg.h
index aeecdcac3d..ca790e7211 100644
--- a/ui/gtk/capture_if_dlg.h
+++ b/ui/gtk/capture_if_dlg.h
@@ -44,7 +44,7 @@ capture_if_cb(GtkWidget *widget, gpointer data);
#ifdef HAVE_LIBPCAP
-#include <capchild/capture_ifinfo.h> /* for if_info_t */
+#include "caputils/capture_ifinfo.h" /* for if_info_t */
/*
* Used to retrieve the interface icon
diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
index 497aa7b9f3..cf0fdd040b 100644
--- a/ui/gtk/capture_info_dlg.c
+++ b/ui/gtk/capture_info_dlg.c
@@ -32,7 +32,9 @@
#include "ui/capture.h"
#include "../capture_info.h"
+#if 0
#include "../capture-pcap-util.h"
+#endif
#include "ui/capture_ui_utils.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index ad723142f3..b747c5af17 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -49,10 +49,6 @@
#include <zlib.h> /* to get the libz version number */
#endif
-#ifdef HAVE_LIBCAP
-# include <sys/capability.h>
-#endif
-
#ifdef _WIN32 /* Needed for console I/O */
#include <fcntl.h>
@@ -134,17 +130,17 @@
#include "codecs/codecs.h"
-#include "capture-pcap-util.h"
+#include "caputils/capture-pcap-util.h"
#ifdef HAVE_LIBPCAP
-#include <capchild/capture_ifinfo.h>
+#include "caputils/capture_ifinfo.h"
#include "ui/capture.h"
#include <capchild/capture_sync.h>
#endif
#ifdef _WIN32
-#include "capture-wpcap.h"
-#include "capture_wpcap_packet.h"
+#include "caputils/capture-wpcap.h"
+#include "caputils/capture_wpcap_packet.h"
#include <tchar.h> /* Needed for Unicode */
#include <wsutil/unicode-utils.h>
#include <commctrl.h>
@@ -1920,9 +1916,9 @@ get_wireshark_gtk_compiled_info(GString *str)
g_string_append(str, ", with Pango ");
g_string_append(str, PANGO_VERSION_STRING);
- /* Libpcap */
+ /* Capture libraries */
g_string_append(str, ", ");
- get_compiled_pcap_version(str);
+ get_compiled_caplibs_version(str);
/* LIBZ */
g_string_append(str, ", ");
@@ -1936,41 +1932,6 @@ get_wireshark_gtk_compiled_info(GString *str)
#else /* HAVE_LIBZ */
g_string_append(str, "without libz");
#endif /* HAVE_LIBZ */
-
- /*
- * XXX - these libraries are actually used only by dumpcap,
- * but we mention them here so that a user reporting a bug
- * can get information about dumpcap's libraries without
- * having to run dumpcap.
- */
-#ifndef _WIN32
- /* This is UN*X-only. */
- /* LIBCAP */
- g_string_append(str, ", ");
-#ifdef HAVE_LIBCAP
- g_string_append(str, "with POSIX capabilities");
-#ifdef _LINUX_CAPABILITY_VERSION
- g_string_append(str, " (Linux)");
-#endif /* _LINUX_CAPABILITY_VERSION */
-#else /* HAVE_LIBCAP */
- g_string_append(str, "without POSIX capabilities");
-#endif /* HAVE_LIBCAP */
-#endif /* _WIN32 */
-
-#ifdef __linux__
- /* This is a Linux-specific library. */
- /* LIBNL */
- g_string_append(str, ", ");
-#if defined(HAVE_LIBNL1)
- g_string_append(str, "with libnl 1");
-#elif defined(HAVE_LIBNL2)
- g_string_append(str, "with libnl 2");
-#elif defined(HAVE_LIBNL3)
- g_string_append(str, "with libnl 3");
-#else /* no libnl */
- g_string_append(str, "without libnl");
-#endif /* libnl version */
-#endif /* __linux__ */
}
static void
@@ -2002,9 +1963,9 @@ static void
get_wireshark_runtime_info(GString *str)
{
#ifdef HAVE_LIBPCAP
- /* Libpcap */
+ /* Capture libraries */
g_string_append(str, ", ");
- get_runtime_pcap_version(str);
+ get_runtime_caplibs_version(str);
#endif
/* zlib */
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index 212c9ffbb4..17bb8c34c1 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -45,7 +45,7 @@
#include "ui/ui_util.h"
#include "ui/gtk/main_80211_toolbar.h"
-#include "ws80211_utils.h"
+#include "caputils/ws80211_utils.h"
#include <capchild/capture_session.h>
#include <capchild/capture_sync.h>
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index f87fdb5f44..955d02d336 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -30,7 +30,9 @@
#include "../color.h"
#ifdef HAVE_LIBPCAP
#include "ui/capture.h"
+#if 0
#include "capture-pcap-util.h"
+#endif
#include "capture_opts.h"
#endif
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index d92b4a15fb..53bca5c809 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -30,7 +30,7 @@
#include <epan/prefs.h>
#include "capture_opts.h"
-#include <capchild/capture_ifinfo.h>
+#include "caputils/capture_ifinfo.h"
#include "ui/capture_ui_utils.h"
#include "ui/capture_globals.h"
#include "ui/iface_lists.h"
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 17a903b592..60bed8ec25 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -59,7 +59,7 @@
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
-#include "capture-wpcap.h"
+#include "caputils/capture-wpcap.h"
#endif /* _WIN32 */
#ifdef HAVE_AIRPCAP
#include "airpcap.h"
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index 96094f881e..7be72452d0 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -36,7 +36,9 @@
#include "../globals.h"
#include "../file.h"
#include "../summary.h"
+#if 0
#include "../capture-pcap-util.h"
+#endif
#ifdef HAVE_LIBPCAP
#include "ui/capture.h"