aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/main.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-03-11 09:15:12 -0800
committerGerald Combs <gerald@wireshark.org>2016-03-11 19:55:57 +0000
commit6ed543dbe6115170be335b42c6ba01c42568c6e8 (patch)
tree230a739d536fd5baf22c73f17d40cf3afce5cbb3 /ui/gtk/main.c
parentd9c274bebf6df89cc96d06d10735c134bd17011b (diff)
Remove the last remnants of U3 support.
Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30 Reviewed-on: https://code.wireshark.org/review/14425 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk/main.c')
-rw-r--r--ui/gtk/main.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 220d6a5885..42215a4afb 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -63,7 +63,6 @@
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
-#include <wsutil/u3.h>
#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
@@ -2030,11 +2029,6 @@ get_wireshark_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 *
@@ -3348,10 +3342,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
@@ -3380,9 +3370,6 @@ main(int argc, char *argv[])
gtk_iface_mon_stop();
#endif
- /* deregister our pid */
- u3_deregister_pid();
-
epan_cleanup();
AirPDcapDestroyContext(&airpdcap_ctx);