Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.

svn path=/trunk/; revision=50165

CMakeLists.txt

@@ -659,8 +659,6 @@ set(WIRESHARK_COMMON_SRC
 	ps.c
 	svnversion.h
 	sync_pipe_write.c
-	tap-megaco-common.c
-	tap-rtp-common.c
 	version_info.c
 )
 
@@ -840,6 +838,7 @@ register_tap_files(tshark-tap-register.c
 
 if(BUILD_tshark)
 	set(tshark_LIBS
+		ui
 		${LIBEPAN_LIBS}
 		${APPLE_CORE_FOUNDATION_LIBRARY}
 		${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
@@ -849,7 +848,6 @@ if(BUILD_tshark)
 		capture_sync.c
 		tshark-tap-register.c
 		tshark.c
-		ui/util.c
 		${TSHARK_TAP_SRC}
 		${SHARK_COMMON_CAPTURE_SRC}
 	        ${WIRESHARK_COMMON_SRC}

Makefile.common

@@ -56,8 +56,6 @@ SHARK_COMMON_SRC =	\
 	print.c			\
 	ps.c			\
 	sync_pipe_write.c	\
-	tap-megaco-common.c	\
-	tap-rtp-common.c	\
 	version_info.c
 
 # corresponding headers
@@ -79,8 +77,6 @@ SHARK_COMMON_INCLUDES =	\
 	print.h			\
 	ps.h			\
 	register.h		\
-	tap-megaco-common.h	\
-	tap-rtp-common.h	\
 	version_info.h		\
 	ws_symbol_export.h
 

ui/CMakeLists.txt

@@ -35,6 +35,8 @@ set(COMMON_UI_SRC
 	recent.c
 	ssl_key_export.c
 	software_update.c
+	tap-megaco-common.c
+	tap-rtp-common.c
 	text_import.c
 	time_shift.c
 	util.c

ui/Makefile.common

@@ -45,7 +45,7 @@ GENERATOR_FILES = \
 
 WIRESHARK_UI_SRC = \
 	alert_box.c		\
-	export_object.c	\
+	export_object.c		\
 	export_object_dicom.c	\
 	export_object_http.c	\
 	export_object_smb.c	\
@@ -56,6 +56,8 @@ WIRESHARK_UI_SRC = \
 	recent.c		\
 	software_update.c	\
 	ssl_key_export.c	\
+	tap-megaco-common.c	\
+	tap-rtp-common.c	\
 	text_import.c		\
 	time_shift.c		\
 	util.c
@@ -77,6 +79,8 @@ noinst_HEADERS = \
 	simple_dialog.h		\
 	software_update.h	\
 	ssl_key_export.h	\
+	tap-megaco-common.h	\
+	tap-rtp-common.h	\
 	text_import.h		\
 	text_import_scanner.h	\
 	time_shift.h		\

ui/cli/tap-megacostat.c

@@ -37,7 +37,7 @@
 #include "epan/timestats.h"
 #include <epan/prefs-int.h>
 
-#include "tap-megaco-common.h"
+#include "ui/tap-megaco-common.h"
 
 
 

ui/cli/tap-rtp.c

@@ -45,7 +45,7 @@
 #include <epan/rtp_pt.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/addr_resolv.h>
-#include "tap-rtp-common.h"
+#include "ui/tap-rtp-common.h"
 
 /* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark.
  */

ui/gtk/megaco_stat.c

@@ -49,7 +49,7 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
 
-#include "tap-megaco-common.h"
+#include "ui/tap-megaco-common.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 

ui/gtk/rtp_stream.c

@@ -43,7 +43,7 @@
 #include "../globals.h"
 #include "ui/alert_box.h"
 #include "ui/simple_dialog.h"
-#include "../tap-rtp-common.h"
+#include "ui/tap-rtp-common.h"
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/rtp_stream.h"

ui/qt/QtShark.pro

@@ -185,8 +185,6 @@ SOURCES_WS_C = \
     ../../ps.c    \
     ../../summary.c       \
     ../../sync_pipe_write.c       \
-    ../../tap-megaco-common.c     \
-    ../../tap-rtp-common.c    \
     ../../u3.c \
     ../../version_info.c