diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-03-11 09:15:12 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-03-11 19:55:57 +0000 |
| commit | 6ed543dbe6115170be335b42c6ba01c42568c6e8 (patch) | |
| tree | 230a739d536fd5baf22c73f17d40cf3afce5cbb3 /ui/recent.c | |
| parent | d9c274bebf6df89cc96d06d10735c134bd17011b (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/recent.c')
| -rw-r--r-- | ui/recent.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ui/recent.c b/ui/recent.c index ac5e204a54..566acabbc8 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -39,7 +39,6 @@ #include "ui/recent_utils.h" #include "ui/simple_dialog.h" -#include <wsutil/u3.h> #include <wsutil/file_util.h> #define RECENT_KEY_MAIN_TOOLBAR_SHOW "gui.toolbar_main_show" @@ -846,11 +845,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); @@ -1112,10 +1107,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) { |