From 8fc2327766146184852439fac19a769a097f7c85 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 23 Sep 2014 16:39:52 -0700
Subject: Qt: Fix preference bugs.

Make sure we set the "resolved" member of the column fmt_data struct.

Emitting WiresharkApplication::AppSignals from a modal dialog can cause
event loop problems on OS X. Queue them up in PreferencesDialog and emit
them after closing.

Change-Id: I2de77778a0448db3b87d402e431b8e5f325cbbda
Reviewed-on: https://code.wireshark.org/review/4274
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/preferences_dialog.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui/qt/preferences_dialog.h')

diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index bf8cb04890..1e08d53954 100644
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -30,6 +30,8 @@
 
 #include <epan/prefs.h>
 
+#include "wireshark_application.h"
+
 #include <QDialog>
 #include <QTreeWidgetItem>
 #include <QComboBox>
@@ -48,6 +50,7 @@ class PreferencesDialog : public QDialog
 public:
     explicit PreferencesDialog(QWidget *parent = 0);
     ~PreferencesDialog();
+    const QList<WiresharkApplication::AppSignal> appSignals() const { return app_signals_; }
 
 protected:
     void showEvent(QShowEvent *evt);
@@ -63,6 +66,7 @@ private:
     QString saved_string_pref_;
     QComboBox *cur_combo_box_;
     int saved_combo_idx_;
+    QList<WiresharkApplication::AppSignal> app_signals_;
 
 private slots:
     void on_prefsTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-- 
cgit v1.2.1