diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-15 19:47:02 +0100 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2015-12-16 06:53:24 +0000 |
commit | bfe73e3ad7162830c222a5b0d73433a72324baa5 (patch) | |
tree | df1a1ee6779cb31093e9253152317e9f444fc91a /wireshark-qt.cpp | |
parent | 3b706bab624a22c500adb3bdf50123f73e56c4ca (diff) |
Qt: save custom colors in recent_common file
This allows to save colors across sessions for systems other than
OSX that do not provide a system wide color picker
While we are at it, let's stop reading the recent file twice at startup
Bug: 11888
Change-Id: I69ff14d699d8111fe6a8bdac0157fcd115a60c2b
Reviewed-on: https://code.wireshark.org/review/12659
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r-- | wireshark-qt.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 6f6e6f3669..fc9ef0c9d0 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -745,9 +745,6 @@ int main(int argc, char *argv[]) g_free(rf_path); } - /* Init the "Open file" dialog directory */ - /* (do this after the path settings are processed) */ - /* Read the profile dependent (static part) of the recent file. */ /* Only the static part of it will be read, as we don't have the gui now to fill the */ /* recent lists which is done in the dynamic part. */ @@ -758,6 +755,7 @@ int main(int argc, char *argv[]) rf_path, g_strerror(rf_open_errno)); g_free(rf_path); } + wsApp->applyCustomColorsFromRecent(); // Initialize our language read_language_prefs(); @@ -776,18 +774,6 @@ int main(int argc, char *argv[]) /* Init the "Open file" dialog directory */ /* (do this after the path settings are processed) */ - - /* Read the profile dependent (static part) of the recent file. */ - /* Only the static part of it will be read, as we don't have the gui now to fill the */ - /* recent lists which is done in the dynamic part. */ - /* We have to do this already here, so command line parameters can overwrite these values. */ - if (!recent_read_profile_static(&rf_path, &rf_open_errno)) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Could not open recent file\n\"%s\": %s.", - rf_path, g_strerror(rf_open_errno)); - g_free(rf_path); - } - if (recent.gui_fileopen_remembered_dir && test_for_directory(recent.gui_fileopen_remembered_dir) == EISDIR) { wsApp->setLastOpenDir(recent.gui_fileopen_remembered_dir); |