aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2004-02-21 12:58:42 +0000
committerUlf Lamping <ulf.lamping@web.de>2004-02-21 12:58:42 +0000
commitba50469654ce37b73384934d41be30a13fcf737f (patch)
treec3f94a98be45636b988117a4cee167972a66972e /gtk
parent9a7cac1dfff35064d3140e6b3281d9d442e451c2 (diff)
rework of capture.c: better seperation of sync and capture pipe by using
explicit names and seperated functionality of do_capture(), but no functional change! svn path=/trunk/; revision=10168
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_info_dlg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 56265aaf26..2ca95cdf80 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -1,7 +1,7 @@
/* capture_info_dlg.c
* Routines for packet capture info dialog
*
- * $Id: capture_info_dlg.c,v 1.11 2004/01/21 21:19:32 ulfl Exp $
+ * $Id: capture_info_dlg.c,v 1.12 2004/02/21 12:58:42 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -70,14 +70,14 @@ pct(gint num, gint denom) {
/* stop button (or ESC key) was pressed */
static void
-capture_info_stop_cb(GtkWidget *w _U_, gpointer data) {
- capture_ui_stop_callback(data);
+capture_info_stop_cb(GtkWidget *w _U_, gpointer data _U_) {
+ capture_stop();
}
static void
-capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) {
- capture_ui_stop_callback(data);
+capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data _U_) {
+ capture_stop();
}
@@ -209,9 +209,9 @@ capture_info *cinfo)
stop_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_STOP);
gtk_widget_grab_default(stop_bt);
SIGNAL_CONNECT(stop_bt, "clicked", capture_info_stop_cb,
- cinfo->callback_data);
+ NULL);
SIGNAL_CONNECT(info->cap_w, "delete_event", capture_info_delete_cb,
- cinfo->callback_data);
+ NULL);
/* Catch the "key_press_event" signal in the window, so that we can catch
the ESC key being pressed and act as if the "Stop" button had