diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-24 14:06:23 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-25 22:02:43 +0000 |
| commit | ea6fa049c9c43a6852c2a1e8b72598e13a27786b (patch) | |
| tree | 317fec804ce7aaaf619f813bba9c0efda22020b6 /ui/gtk/prefs_dlg.c | |
| parent | 2ee45fe2daffe10b519dc54699480db1c0a4f5ed (diff) | |
| download | wireshark-ea6fa049c9c43a6852c2a1e8b72598e13a27786b.tar.gz | |
Update the simple dialog code.
Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a
subclass of QMessageBox. Queue messages at startup similar to GTK+.
Move the GTK+-specific simple_dialog declarations to
gtk/simple_dialog.h.
Don't yell at the user so much. Replace exclamation points with periods.
Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4
Reviewed-on: https://code.wireshark.org/review/4288
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk/prefs_dlg.c')
| -rw-r--r-- | ui/gtk/prefs_dlg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 3dc299e26d..769b24505a 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -34,9 +34,8 @@ #include <epan/epan_dissect.h> #include <epan/print.h> -#include "../file.h" +#include "file.h" #include "ui/preference_utils.h" -#include "ui/simple_dialog.h" #include "ui/gtk/main.h" #include "ui/gtk/prefs_column.h" @@ -56,6 +55,7 @@ #include "ui/gtk/file_dlg.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/packet_win.h" +#include "simple_dialog.h" #ifdef HAVE_LIBPCAP #ifdef _WIN32 |