diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-11-22 00:20:23 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-11-22 00:20:23 +0000 |
| commit | 70709e1b3566afd6054c1a63edfa3b053344026e (patch) | |
| tree | 60e15e3fb3c412c21407f0a948e515d2f1815c24 /ui/gtk/main.c | |
| parent | fc5adb9b6681ad5a8026b011187bcdf5b2e55f01 (diff) | |
Move common "decode as" preference code to epan.
We presumably want "decode as" behavior to be consistent across UIs so
call load_decode_as_entries() from read_prefs().
svn path=/trunk/; revision=53498
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 72a5042235..72739e55b3 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -71,13 +71,14 @@ #include <wiretap/merge.h> +#include <epan/addr_resolv.h> +#include <epan/column.h> +#include <epan/disabled_protos.h> #include <epan/epan.h> #include <epan/epan_dissect.h> -#include <epan/timestamp.h> #include <epan/plugins.h> #include <epan/dfilter/dfilter.h> #include <epan/strutil.h> -#include <epan/addr_resolv.h> #include <epan/emem.h> #include <epan/ex-opt.h> #include <epan/funnel.h> @@ -88,9 +89,8 @@ #include <epan/tap.h> #include <epan/stat_cmd_args.h> #include <epan/uat.h> -#include <epan/column.h> -#include <epan/disabled_protos.h> #include <epan/print.h> +#include <epan/timestamp.h> /* general (not GTK specific) */ #include "../file.h" @@ -1969,9 +1969,6 @@ read_configuration_files(char **gdp_path, char **dp_path) int pf_open_errno, pf_read_errno; e_prefs *prefs_p; - /* load the decode as entries of this profile */ - load_decode_as_entries(); - /* Read the preference files. */ prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); |