aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gtk/main.c')
-rw-r--r--ui/gtk/main.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 1516fbadce..b9b4292cc4 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -1907,11 +1907,8 @@ read_configuration_files(void)
{
e_prefs *prefs_p;
- /* load the decode as entries of this profile */
- load_decode_as_entries();
-
- /* Read the preference files. */
- prefs_p = read_prefs();
+ /* Load libwireshark settings from the current profile. */
+ prefs_p = epan_load_settings();
#ifdef _WIN32
/* if the user wants a console to be always there, well, we should open one for him */
@@ -1926,12 +1923,6 @@ read_configuration_files(void)
/* Read the display filter file. */
read_filter_list(DFILTER_LIST);
- /*
- * Read the files that enable and disable protocols and heuristic
- * dissectors.
- */
- read_enabled_and_disabled_lists();
-
return prefs_p;
}