aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/simple_dialog.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-10-31 01:44:11 +0000
committerGerald Combs <gerald@wireshark.org>2006-10-31 01:44:11 +0000
commit2fcb67b4961a6e983d591629186f9cc9b19c3e33 (patch)
tree01de9558a386f04a12d3b44485ed804382c41b84 /gtk/simple_dialog.c
parentb61a0b3d16895a559c85b3dbe7252b7a32817726 (diff)
downloadwireshark-2fcb67b4961a6e983d591629186f9cc9b19c3e33.tar.gz
wireshark-2fcb67b4961a6e983d591629186f9cc9b19c3e33.tar.bz2
wireshark-2fcb67b4961a6e983d591629186f9cc9b19c3e33.zip
From Giorgio Tino: Add a "Don't show this message again" option to an
AirPcap warning dialog. Fix a callback bug in simple_dialog.c. svn path=/trunk/; revision=19747
Diffstat (limited to 'gtk/simple_dialog.c')
-rw-r--r--gtk/simple_dialog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 4f9f34fa1d..fe288dd7b4 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -373,10 +373,10 @@ simple_dialog_cancel_cb(GtkWidget *w, gpointer win) {
simple_dialog_cb_t callback_fct = OBJECT_GET_DATA(win, CALLBACK_FCT_KEY);
gpointer data = OBJECT_GET_DATA(win, CALLBACK_DATA_KEY);
- window_destroy(GTK_WIDGET(win));
-
if (callback_fct)
(callback_fct) (win, button, data);
+
+ window_destroy(GTK_WIDGET(win));
}
void
@@ -403,7 +403,7 @@ void simple_dialog_check_set(gpointer dialog, gchar *text) {
}
gboolean simple_dialog_check_get(gpointer dialog) {
- GtkWidget *ask_cb = OBJECT_GET_DATA(dialog, CHECK_BUTTON);
+ GtkWidget *ask_cb = OBJECT_GET_DATA(GTK_WIDGET(dialog), CHECK_BUTTON);
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_cb));
}