Move capture_ui_utils.[ch] to libui.

Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a
Reviewed-on: https://code.wireshark.org/review/2708
Reviewed-by: Guy Harris <guy@alum.mit.edu>

7 files changed, 10 insertions, 7 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index dcaf302f2c..e2a65ff602 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -39,9 +39,9 @@
 #include "../capture.h"
 #include <capchild/capture_ifinfo.h>
 #include "../capture-pcap-util.h"
-#include "../capture_ui_utils.h"
 #include "../ringbuffer.h"
 
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "ui/preference_utils.h"
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 306e2ab64e..5d9302d812 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -36,10 +36,10 @@
 #include <capchild/capture_ifinfo.h>
 #include "../capture.h"
 #include "../capture-pcap-util.h"
-#include "../capture_ui_utils.h"
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>
 
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/recent.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
index 16cde28839..d7c946cfcf 100644
--- a/ui/gtk/capture_info_dlg.c
+++ b/ui/gtk/capture_info_dlg.c
@@ -32,9 +32,10 @@
 
 #include "../capture.h"
 #include "../capture_info.h"
-#include "../capture_ui_utils.h"
 #include "../capture-pcap-util.h"
 
+#include "ui/capture_ui_utils.h"
+
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index ff5bf274b3..c7a4a615db 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -123,6 +123,7 @@
 #include "ui/ui_util.h"
 
 #ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #endif
@@ -130,7 +131,6 @@
 #include "codecs/codecs.h"
 
 #ifdef HAVE_LIBPCAP
-#include "capture_ui_utils.h"
 #include "capture-pcap-util.h"
 #include <capchild/capture_ifinfo.h>
 #include "capture.h"
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index a76d03470c..8cdfc18f36 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -39,7 +39,6 @@
 #ifdef HAVE_LIBPCAP
 #include "../capture_opts.h"
 #include "../capture_session.h"
-#include "../capture_ui_utils.h"
 #include "../capture.h"
 #endif
 
@@ -48,6 +47,9 @@
 #include "ui/main_statusbar.h"
 #include "ui/recent.h"
 #include "ui/utf8_entities.h"
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
+#endif
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/main_statusbar_private.h"
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index ca34a12230..24159f6d99 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -32,7 +32,6 @@
 #include "capture.h"
 #include "capture-pcap-util.h"
 #include "capture_opts.h"
-#include "capture_ui_utils.h"
 #endif
 
 #include <wsutil/file_util.h>
@@ -40,6 +39,7 @@
 #include <wsutil/ws_version_info.h>
 
 #ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
 #include "ui/iface_lists.h"
 #include "ui/capture_globals.h"
 #endif
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index 703afd9c98..d92b4a15fb 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -31,7 +31,7 @@
 
 #include "capture_opts.h"
 #include <capchild/capture_ifinfo.h>
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "ui/simple_dialog.h"