summaryrefslogtreecommitdiff
path: root/ui/gtk/main_airpcap_toolbar.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-09-24 14:06:23 -0700
committerGerald Combs <gerald@wireshark.org>2014-09-25 22:02:43 +0000
commitea6fa049c9c43a6852c2a1e8b72598e13a27786b (patch)
tree317fec804ce7aaaf619f813bba9c0efda22020b6 /ui/gtk/main_airpcap_toolbar.c
parent2ee45fe2daffe10b519dc54699480db1c0a4f5ed (diff)
downloadwireshark-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/main_airpcap_toolbar.c')
-rw-r--r--ui/gtk/main_airpcap_toolbar.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c
index d6b1361dea..eec3a2e871 100644
--- a/ui/gtk/main_airpcap_toolbar.c
+++ b/ui/gtk/main_airpcap_toolbar.c
@@ -31,19 +31,19 @@
#include <gtk/gtk.h>
#include "ui/gtk/old-gtk-compat.h"
-#include <epan/epan.h>
-#include <epan/frequency-utils.h>
+#include "epan/epan.h"
+#include "epan/frequency-utils.h"
#include "ui/recent.h"
-#include "ui/simple_dialog.h"
+#include "simple_dialog.h"
#include "main.h"
#include "main_airpcap_toolbar.h"
#include "keys.h"
-#include <caputils/airpcap.h>
-#include <caputils/airpcap_loader.h>
+#include "caputils/airpcap.h"
+#include "caputils/airpcap_loader.h"
#include "airpcap_dlg.h"
#include "airpcap_gui_utils.h"