aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capture.c10
-rw-r--r--column.c6
-rw-r--r--filter.c7
-rw-r--r--prefs.c28
4 files changed, 40 insertions, 11 deletions
diff --git a/capture.c b/capture.c
index 60f049a374..5eb97ecab5 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.14 1998/12/22 05:52:48 gram Exp $
+ * $Id: capture.c,v 1.15 1998/12/22 07:07:08 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -300,7 +300,7 @@ capture_prep_cb(GtkWidget *w, gpointer d) {
gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_COUNT_KEY, count_cb);
gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_OPEN_KEY, capfile_ck);
gtk_object_set_data(GTK_OBJECT(cap_open_w), E_CAP_SNAP_KEY, snap_sb);
-
+
gtk_widget_show(cap_open_w);
}
@@ -349,6 +349,9 @@ capture_prep_ok_cb(GtkWidget *w, gpointer data) {
GtkWidget *if_cb, *filter_te, *file_te, *count_cb, *open_ck, *snap_sb;
gint open;
+#ifdef GTK_HAVE_FEATURES_1_1_0
+ data = w;
+#endif
if_cb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(data), E_CAP_IFACE_KEY);
filter_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(data), E_CAP_FILT_KEY);
file_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(data), E_CAP_FILE_KEY);
@@ -380,6 +383,9 @@ capture_prep_ok_cb(GtkWidget *w, gpointer data) {
void
capture_prep_close_cb(GtkWidget *w, gpointer win) {
+#ifdef GTK_HAVE_FEATURES_1_1_0
+ win = w;
+#endif
gtk_grab_remove(GTK_WIDGET(win));
gtk_widget_destroy(GTK_WIDGET(win));
}
diff --git a/column.c b/column.c
index 03a44d6610..819c3e907c 100644
--- a/column.c
+++ b/column.c
@@ -1,7 +1,7 @@
/* column.c
* Routines for handling column preferences
*
- * $Id: column.c,v 1.5 1998/12/17 05:42:20 gram Exp $
+ * $Id: column.c,v 1.6 1998/12/22 07:07:09 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -419,7 +419,11 @@ column_prefs_show() {
gtk_list_set_selection_mode(GTK_LIST(column_l), GTK_SELECTION_SINGLE);
gtk_signal_connect(GTK_OBJECT(column_l), "selection_changed",
GTK_SIGNAL_FUNC(column_sel_list_cb), main_vb);
+#ifdef GTK_HAVE_FEATURES_1_1_4
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(column_sc), column_l);
+#else
gtk_container_add(GTK_CONTAINER(column_sc), column_l);
+#endif
gtk_widget_show(column_l);
clp = g_list_first(prefs.col_list);
diff --git a/filter.c b/filter.c
index e05b001834..5005f0e046 100644
--- a/filter.c
+++ b/filter.c
@@ -1,7 +1,7 @@
/* filter.c
* Routines for managing filter sets
*
- * $Id: filter.c,v 1.10 1998/12/17 05:42:24 gram Exp $
+ * $Id: filter.c,v 1.11 1998/12/22 07:07:10 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -244,7 +244,10 @@ filter_sel_list_cb(GtkWidget *l, gpointer data) {
GtkObject *l_item;
gint sensitivity = FALSE;
- sl = GTK_LIST(l)->selection;
+ if (l)
+ sl = GTK_LIST(l)->selection;
+ else
+ sl = NULL;
if (sl) { /* Something was selected */
l_item = GTK_OBJECT(sl->data);
diff --git a/prefs.c b/prefs.c
index d0372585b3..3b24faa574 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.13 1998/12/17 05:42:29 gram Exp $
+ * $Id: prefs.c,v 1.14 1998/12/22 07:07:11 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -73,9 +73,13 @@ prefs_cb(GtkWidget *w, gpointer sp) {
GtkWidget *prefs_w, *main_vb, *top_hb, *bbox, *prefs_nb,
*ok_bt, *save_bt, *cancel_bt;
GtkWidget *print_pg, *filter_pg, *column_pg, *filter_te, *label;
+
/* GtkWidget *nlabel; */
gint start_page = (gint) sp;
+ filter_pg = NULL;
+ filter_te = NULL;
+
prefs_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(prefs_w), "Ethereal: Preferences");
@@ -108,18 +112,21 @@ prefs_cb(GtkWidget *w, gpointer sp) {
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), print_pg, label);
/* Filter prefs */
- filter_te = gtk_object_get_data(GTK_OBJECT(w), E_FILT_TE_PTR_KEY);
- filter_pg = filter_prefs_show(filter_te);
+ if (w) {
+ filter_te = gtk_object_get_data(GTK_OBJECT(w), E_FILT_TE_PTR_KEY);
+ filter_pg = filter_prefs_show(filter_te);
#ifdef WITH_WIRETAP
gtk_widget_set_sensitive(filter_pg, FALSE);
#endif
-
+ }
+
+ if (w) {
/* Pass along the entry widget pointer from the calling widget */
gtk_object_set_data(GTK_OBJECT(filter_pg), E_FILT_TE_PTR_KEY, filter_te);
gtk_object_set_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY, filter_pg);
label = gtk_label_new ("Filters");
gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), filter_pg, label);
-
+ }
/* Column prefs */
column_pg = column_prefs_show();
gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
@@ -164,7 +171,10 @@ prefs_cb(GtkWidget *w, gpointer sp) {
void
prefs_main_ok_cb(GtkWidget *w, gpointer win) {
-
+
+#ifdef GTK_HAVE_FEATURES_1_1_0
+ win = w;
+#endif
printer_prefs_ok(gtk_object_get_data(GTK_OBJECT(win), E_PRINT_PAGE_KEY));
filter_prefs_ok(gtk_object_get_data(GTK_OBJECT(win), E_FILTER_PAGE_KEY));
column_prefs_ok(gtk_object_get_data(GTK_OBJECT(win), E_COLUMN_PAGE_KEY));
@@ -173,6 +183,9 @@ prefs_main_ok_cb(GtkWidget *w, gpointer win) {
void
prefs_main_save_cb(GtkWidget *w, gpointer win) {
+#ifdef GTK_HAVE_FEATURES_1_1_0
+ win = w;
+#endif
printer_prefs_save(gtk_object_get_data(GTK_OBJECT(win), E_PRINT_PAGE_KEY));
filter_prefs_save(gtk_object_get_data(GTK_OBJECT(win), E_FILTER_PAGE_KEY));
column_prefs_save(gtk_object_get_data(GTK_OBJECT(win), E_COLUMN_PAGE_KEY));
@@ -182,6 +195,9 @@ prefs_main_save_cb(GtkWidget *w, gpointer win) {
void
prefs_main_cancel_cb(GtkWidget *w, gpointer win) {
+#ifdef GTK_HAVE_FEATURES_1_1_0
+ win = w;
+#endif
printer_prefs_cancel(gtk_object_get_data(GTK_OBJECT(win), E_PRINT_PAGE_KEY));
filter_prefs_cancel(gtk_object_get_data(GTK_OBJECT(win), E_FILTER_PAGE_KEY));
column_prefs_cancel(gtk_object_get_data(GTK_OBJECT(win), E_COLUMN_PAGE_KEY));
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 07:07:01 +0000