From eda0f472c93147b6946d9175809d8b38162abb66 Mon Sep 17 00:00:00 2001
From: Stephen Fisher <steve@stephen-fisher.com>
Date: Sun, 28 Nov 2010 00:15:21 +0000
Subject: [PATCH] Move u3 code to top-level directory since it's not GTK
 specific

svn path=/trunk/; revision=35046
---
 Makefile.common     | 4 +++-
 gtk/Makefile.common | 2 --
 gtk/main.c          | 2 +-
 gtk/menus.c         | 2 +-
 gtk/recent.c        | 2 +-
 gtk/u3.c => u3.c    | 2 +-
 gtk/u3.h => u3.h    | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename gtk/u3.c => u3.c (99%)
 rename gtk/u3.h => u3.h (94%)

diff --git a/Makefile.common b/Makefile.common
index e4345155b3..930c004c41 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -151,7 +151,8 @@ wireshark_SOURCES =	\
 	merge.c	\
 	proto_hier_stats.c	\
 	summary.c	\
-	tempfile.c
+	tempfile.c	\
+	u3.c
 
 # corresponding headers
 wireshark_INCLUDES =	\
@@ -175,6 +176,7 @@ wireshark_INCLUDES =	\
 	stat_menu.h	\
 	summary.h	\
 	sync_pipe.h	\
+	u3.h	\
 	ui_util.h
 
 # tshark specifics
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 794a95530e..5cb2f3e58f 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -136,7 +136,6 @@ WIRESHARK_GTK_SRC = \
 	tap_dfilter_dlg.c	\
 	text_import.c	\
 	text_page_utils.c	\
-	u3.c		\
 	uat_gui.c	\
 	voip_calls.c	\
 	webbrowser.c
@@ -327,7 +326,6 @@ noinst_HEADERS = \
 	text_import.h	\
 	text_import_scanner.h	\
 	text_page_utils.h	\
-	u3.h \
 	uat_gui.h \
 	utf8_entities.h \
 	voip_calls.h	\
diff --git a/gtk/main.c b/gtk/main.c
index 325d6134e1..720881fcda 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -104,6 +104,7 @@
 #include "../merge.h"
 #include "../alert_box.h"
 #include "../log.h"
+#include "../u3.h"
 #include <wsutil/file_util.h>
 
 #ifdef HAVE_LIBPCAP
@@ -131,7 +132,6 @@
 #include "gtk/color_dlg.h"
 #include "gtk/filter_dlg.h"
 #include "gtk/uat_gui.h"
-#include "gtk/u3.h"
 #include "gtk/main.h"
 #include "gtk/main_airpcap_toolbar.h"
 #include "gtk/main_filter_toolbar.h"
diff --git a/gtk/menus.c b/gtk/menus.c
index cc5608d8bd..5353711f6e 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -51,6 +51,7 @@
 #include "../main_statusbar.h"
 #include "../color_filters.h"
 #include "../stat_menu.h"
+#include "../u3.h"
 
 #include "gtk/about_dlg.h"
 #include "gtk/capture_dlg.h"
@@ -85,7 +86,6 @@
 #include "gtk/packet_history.h"
 #include "gtk/sctp_stat.h"
 #include "gtk/firewall_dlg.h"
-#include "gtk/u3.h"
 #include "gtk/macros_dlg.h"
 #include "gtk/export_object.h"
 #include "gtk/gui_stat_menu.h"
diff --git a/gtk/recent.c b/gtk/recent.c
index dbcf0480d6..b8a2dfe35d 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -40,6 +40,7 @@
 #include <epan/column.h>
 
 #include "../simple_dialog.h"
+#include "../u3.h"
 #include <wsutil/file_util.h>
 
 #include "gtk/recent.h"
@@ -53,7 +54,6 @@
 #endif /*NEW_PACKET_LIST */
 #include "gtk/file_dlg.h"
 #include "gtk/cfilter_combo_utils.h"
-#include "gtk/u3.h"
 
 #ifdef HAVE_PCAP_REMOTE
 #include "gtk/capture_dlg.h"
diff --git a/gtk/u3.c b/u3.c
similarity index 99%
rename from gtk/u3.c
rename to u3.c
index a2bc304875..ec15202540 100644
--- a/gtk/u3.c
+++ b/u3.c
@@ -50,7 +50,7 @@
 
 #include <epan/filesystem.h>
 
-#include <gtk/u3.h>
+#include "u3.h"
 
 
 #define U3_DEVICE_PATH_VAR   "$U3_DEVICE_PATH"
diff --git a/gtk/u3.h b/u3.h
similarity index 94%
rename from gtk/u3.h
rename to u3.h
index 3239c69759..326363b087 100644
--- a/gtk/u3.h
+++ b/u3.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __GTK_U3_H__
-#define __GTK_U3_H__
+#ifndef __U3_H__
+#define __U3_H__
 
 gboolean u3_active(void);
 
@@ -35,4 +35,4 @@ void u3_deregister_pid(void);
 char * u3_expand_device_path(char *path);
 char * u3_contract_device_path(char *path);
 
-#endif /* __GTK_U3_H__ */
+#endif /* __U3_H__ */