Remove U3 code and packaging.

svn path=/trunk/; revision=52896

5 files changed, 5 insertions, 44 deletions

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index bad98e4873..5a0cae40b8 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -64,7 +64,6 @@
 #endif /* HAVE_LIBPORTAUDIO */
 
 #include <wsutil/crash_info.h>
-#include <wsutil/u3.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
 
@@ -1949,11 +1948,6 @@ get_gui_runtime_info(GString *str)
   g_string_append(str, ", ");
   get_runtime_airpcap_version(str);
 #endif
-
-  if(u3_active()) {
-    g_string_append(str, ", ");
-    u3_runtime_info(str);
-  }
 }
 
 static e_prefs *
@@ -3191,10 +3185,6 @@ main(int argc, char *argv[])
     main_filter_packets(&cfile, dfilter, FALSE);
   }
 
-
-  /* register our pid if we are being run from a U3 device */
-  u3_register_pid();
-
   profile_store_persconffiles (FALSE);
 
 #ifdef HAVE_GTKOSXAPPLICATION
@@ -3219,9 +3209,6 @@ main(int argc, char *argv[])
   gtk_iface_mon_stop();
 #endif
 
-  /* deregister our pid */
-  u3_deregister_pid();
-
   epan_cleanup();
 
   AirPDcapDestroyContext(&airpdcap_ctx);
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index e30b1cdbb5..8491e5fa5e 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <wsutil/u3.h>
-
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
@@ -4405,10 +4403,7 @@ menu_recent_file_write_all(FILE *rf)
     while (list != NULL) {
         cf_name = (gchar *)list->data;
         if (cf_name) {
-            if(u3_active())
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", u3_contract_device_path(cf_name));
-            else
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
+            fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
         }
         list = g_list_previous(list);
     }
@@ -4424,10 +4419,7 @@ menu_recent_file_write_all(FILE *rf)
         /* get capture filename from the menu item label */
         cf_name = (gchar *)g_object_get_data(G_OBJECT(child->data), MENU_RECENT_FILES_KEY);
         if (cf_name) {
-            if(u3_active())
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", u3_contract_device_path(cf_name));
-            else
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
+            fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
         }
 
         child = g_list_previous(child);
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 9cc27d5d1f..4385e2beb2 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -37,7 +37,6 @@
 #endif
 
 #include <wsutil/crash_info.h>
-#include <wsutil/u3.h>
 #include <wsutil/file_util.h>
 
 #include <wiretap/merge.h>
@@ -435,12 +434,6 @@ get_gui_runtime_info(GString *str)
   get_runtime_airpcap_version(str);
 #endif
 
-
-  if(u3_active()) {
-    g_string_append(str, ", ");
-    u3_runtime_info(str);
-  }
-
 }
 
 /* And now our feature presentation... [ fade to music ] */
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index cc8990a377..1579723682 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -146,10 +146,7 @@ extern "C" void menu_recent_file_write_all(FILE *rf) {
         /* get capture filename from the menu item label */
         cf_name = rii.previous()->filename;
         if (cf_name != NULL) {
-//            if(u3_active())
-//                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", u3_contract_device_path(cf_name));
-//            else
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name.toUtf8().constData());
+            fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name.toUtf8().constData());
         }
     }
 }
diff --git a/ui/recent.c b/ui/recent.c
index 41f5f93263..480b99e275 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -44,7 +44,6 @@
 #include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
-#include <wsutil/u3.h>
 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>
 
@@ -664,11 +663,7 @@ write_profile_recent(void)
 
   if (get_last_open_dir() != NULL) {
     fprintf(rf, "\n# Last directory navigated to in File Open dialog.\n");
-
-    if(u3_active())
-      fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", u3_contract_device_path(get_last_open_dir()));
-    else
-      fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir());
+    fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir());
   }
 
   fclose(rf);
@@ -990,10 +985,7 @@ read_set_recent_pair_dynamic(gchar *key, const gchar *value,
     return PREFS_SET_SYNTAX_ERR;
   }
   if (strcmp(key, RECENT_KEY_CAPTURE_FILE) == 0) {
-    if (u3_active())
-      add_menu_recent_capture_file(u3_expand_device_path(value));
-    else
-      add_menu_recent_capture_file(value);
+    add_menu_recent_capture_file(value);
   } else if (strcmp(key, RECENT_KEY_DISPLAY_FILTER) == 0) {
 	dfilter_combo_add_recent(value);
   } else if (strcmp(key, RECENT_KEY_CAPTURE_FILTER) == 0) {