diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-09 12:27:57 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-09 22:40:30 +0000 |
| commit | 6b3714254d41f4e18ecc1df017804c9d94d21d9b (patch) | |
| tree | b3fb664550e8d60dc19088f3002f1e53b1ef6e59 /ui/qt/wireshark_application.cpp | |
| parent | 7d5ce06cbe35f3f818695c87e5b0f42172ee3784 (diff) | |
| download | wireshark-6b3714254d41f4e18ecc1df017804c9d94d21d9b.tar.gz | |
Pull all the "load settings" calls into a epan_load_settings() routine.
That way, nothing using libwireshark needs to know what settings need to
be loaded, they just call epan_load_settings().
Change-Id: I9390e259e286fc4f5acaeaac2767e4c3c4b656af
Reviewed-on: https://code.wireshark.org/review/20983
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/wireshark_application.cpp')
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 3345bf4bd3..dfffc9748b 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -1107,11 +1107,8 @@ _e_prefs *WiresharkApplication::readConfigurationFiles(bool reset) proto_reenable_all(); } - /* 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 */ @@ -1126,12 +1123,6 @@ _e_prefs *WiresharkApplication::readConfigurationFiles(bool reset) /* 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; } |