Move u3 code to top-level directory since it's not GTK specific
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 28 Nov 2010 00:15:21 +0000 (00:15 +0000)
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 28 Nov 2010 00:15:21 +0000 (00:15 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35046 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.common
gtk/Makefile.common
gtk/main.c
gtk/menus.c
gtk/recent.c
u3.c [moved from gtk/u3.c with 99% similarity]
u3.h [moved from gtk/u3.h with 94% similarity]

index e4345155b3aa46d0beb86f592eda4a19002d82a2..930c004c41acd54683372250078c17f3e409320a 100644 (file)
@@ -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
index 794a95530e38e7a4434bffd17a7c389909747ef9..5cb2f3e58fdd0994a090dbdbd038dbf7c696aac6 100644 (file)
@@ -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    \
index 325d6134e1c5f5d7ca09be313c501cb20504423a..720881fcda6af8e5f6ddab1222a2030f3bb873e8 100644 (file)
 #include "../merge.h"
 #include "../alert_box.h"
 #include "../log.h"
+#include "../u3.h"
 #include <wsutil/file_util.h>
 
 #ifdef HAVE_LIBPCAP
 #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"
index cc5608d8bdc5d5108bcb72c79657d16acf1cfdcc..5353711f6ea3288757d7dd1158fced2638fd0b9b 100644 (file)
@@ -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"
index dbcf0480d6ca9330cb57d44f2958cb6bf0e44783..b8a2dfe35d406cb2290d3d0942b9d22ba2c17f3d 100644 (file)
@@ -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 a2bc304875c01a8d87eec4bcd41fa5830a6f4e1b..ec15202540077a0136fcdbd071d2c7ca1bcf30fa 100644 (file)
--- 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 3239c697595ff541f561238e5ab1ac354839c4c0..326363b0879f7436fcd9f9b6bb05f1dd3c2ccdf3 100644 (file)
--- 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__ */