aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/proto_dlg.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-06-10 10:09:58 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-06-10 10:09:58 +0000
commitdc655c5cf52d185801a4f4d858463a3367beca7f (patch)
treecee7d7c90d22cf35677564c605560df3b8be666f /gtk/proto_dlg.c
parent1d128e95ae5d98f30b2bacb3b71555516f580d29 (diff)
"delete_event" is an event, so its handler takes three arguments, not
two, and it returns a gboolean. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11133 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/proto_dlg.c')
-rw-r--r--gtk/proto_dlg.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index ca42e0b4f1..7053a263fb 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
/* proto_dlg.c
*
- * $Id: proto_dlg.c,v 1.34 2004/05/27 19:59:49 ulfl Exp $
+ * $Id: proto_dlg.c,v 1.35 2004/06/10 10:09:58 guy Exp $
*
* Laurent Deniel <laurent.deniel@free.fr>
*
@@ -43,7 +43,7 @@
#include "disabled_protos.h"
#include <epan/filesystem.h>
-static gboolean proto_delete_cb(GtkWidget *, gpointer);
+static gboolean proto_delete_event_cb(GtkWidget *, GdkEvent *, gpointer);
static void proto_ok_cb(GtkWidget *, gpointer);
static void proto_apply_cb(GtkWidget *, gpointer);
static void proto_save_cb(GtkWidget *, gpointer);
@@ -236,7 +236,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
window_set_cancel_button(proto_w, button, proto_cancel_cb);
- SIGNAL_CONNECT(proto_w, "delete_event", proto_delete_cb, NULL);
+ SIGNAL_CONNECT(proto_w, "delete_event", proto_delete_event_cb, NULL);
SIGNAL_CONNECT(proto_w, "destroy", proto_destroy_cb, NULL);
gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(proto_w));
@@ -391,7 +391,8 @@ proto_destroy_cb(GtkWidget *w _U_, gpointer data _U_)
a higher-level handler that says "OK, we've been asked to delete
this, so destroy it"? */
static gboolean
-proto_delete_cb(GtkWidget *proto_w, gpointer dummy _U_)
+proto_delete_event_cb(GtkWidget *proto_w, GdkEvent *event _U_,
+ gpointer dummy _U_)
{
proto_cancel_cb(NULL, proto_w);
return FALSE;