Use gtk1/gtk2 compatibility macros to reduce #ifdefs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6610 f5534014-38df-0310-8fa8-9805f1628bb7

24 files changed, 582 insertions, 1381 deletions

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 211cab8f4e..7003e56ded 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.2 2002/11/06 10:53:36 sahlberg Exp $
+ * $Id: dcerpc_stat.c,v 1.3 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -40,6 +40,7 @@
 #include "packet-dcerpc.h"
 #include "dcerpc_stat.h"
 #include "../globals.h"
+#include "compat_macros.h"
 
 /* used to keep track of statistics for a specific procedure */
 typedef struct _rpc_procedure_t {
@@ -299,7 +300,7 @@ gtk_dcerpcstat_init(char *optarg)
 	rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	sprintf(title_string,"DCE-RPC RTT Stat for %s version %d.%d", rs->prog, rs->ver&0xff,rs->ver>>8);
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
-	gtk_signal_connect(GTK_OBJECT(rs->win), "destroy", GTK_SIGNAL_FUNC(win_destroy_cb), rs);
+	SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
 
 	vbox=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(rs->win), vbox);
@@ -471,8 +472,8 @@ dcerpcstat_find_vers(gpointer *key, gpointer *value _U_, gpointer *user_data _U_
 
 	sprintf(vs,"%d.%d",k->ver&0xff,k->ver>>8);
 	menu_item=gtk_menu_item_new_with_label(vs);
-	gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-			GTK_SIGNAL_FUNC(dcerpcstat_version_select), (gpointer)((int)k->ver));
+	SIGNAL_CONNECT(menu_item, "activate", dcerpcstat_version_select,
+                       ((int)k->ver));
 	gtk_widget_show(menu_item);
 	gtk_menu_append(GTK_MENU(vers_menu), menu_item);
 
@@ -508,8 +509,7 @@ dcerpcstat_list_programs(gpointer *key, gpointer *value, gpointer *user_data _U_
 	GtkWidget *menu_item;
 
 	menu_item=gtk_menu_item_new_with_label(v->name);
-	gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-			GTK_SIGNAL_FUNC(dcerpcstat_program_select), (gpointer)k);
+	SIGNAL_CONNECT(menu_item, "activate", dcerpcstat_program_select, k);
 
 	gtk_widget_show(menu_item);
 	gtk_menu_append(GTK_MENU(prog_menu), menu_item);
@@ -540,7 +540,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(dlg), "DCE-RPC RTT Statistics");
-	gtk_signal_connect(GTK_OBJECT(dlg), "destroy", GTK_SIGNAL_FUNC(dlg_destroy_cb), NULL);
+	SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 	dlg_box=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(dlg), dlg_box);
 	gtk_widget_show(dlg_box);
@@ -598,9 +598,8 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	/* the start button */
 	start_button=gtk_button_new_with_label("Create Stat");
-	gtk_signal_connect_object(GTK_OBJECT(start_button), "clicked", 
-			GTK_SIGNAL_FUNC(dcerpcstat_start_button_clicked),
-			NULL);
+	SIGNAL_CONNECT_OBJECT(start_button, "clicked", 
+                              dcerpcstat_start_button_clicked, NULL);
 
 	gtk_box_pack_start(GTK_BOX(dlg_box), start_button, TRUE, TRUE, 0);
 	gtk_widget_show(start_button);
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 047a7f6b5e..af9ba94bcb 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
  * (This used to be a notebook page under "Preferences", hence the
  * "prefs" in the file name.)
  *
- * $Id: filter_prefs.c,v 1.39 2002/11/03 17:38:33 oabad Exp $
+ * $Id: filter_prefs.c,v 1.40 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -41,6 +41,7 @@
 #include "ui_util.h"
 #include "simple_dialog.h"
 #include "dfilter_expr_dlg.h"
+#include "compat_macros.h"
 
 #define E_FILT_PARENT_FILTER_TE_KEY "filter_parent_filter_te"
 #define E_FILT_CONSTRUCT_ARGS_KEY   "filter_construct_args"
@@ -118,8 +119,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_)
 
 	/* Has a filter dialog box already been opened for that top-level
 	   widget? */
-	filter_browse_w = gtk_object_get_data(GTK_OBJECT(caller),
-	    E_FILT_DIALOG_PTR_KEY);
+	filter_browse_w = OBJECT_GET_DATA(caller, E_FILT_DIALOG_PTR_KEY);
 
 	if (filter_browse_w != NULL) {
 		/* Yes.  Just re-activate that dialog box. */
@@ -128,7 +128,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_)
 	}
 
 	/* No.  Get the text entry attached to the button. */
-	parent_filter_te = gtk_object_get_data(GTK_OBJECT(w), E_FILT_TE_PTR_KEY);
+	parent_filter_te = OBJECT_GET_DATA(w, E_FILT_TE_PTR_KEY);
 
 	/* Now create a new dialog, without an "Add Expression..." button. */
 	filter_browse_w = filter_dialog_new(caller, parent_filter_te,
@@ -136,12 +136,10 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_)
 
 	/* Set the E_FILT_CALLER_PTR_KEY for the new dialog to point to
 	   our caller. */
-	gtk_object_set_data(GTK_OBJECT(filter_browse_w), E_FILT_CALLER_PTR_KEY,
-	    caller);
+	OBJECT_SET_DATA(filter_browse_w, E_FILT_CALLER_PTR_KEY, caller);
 
 	/* Set the E_FILT_DIALOG_PTR_KEY for the caller to point to us */
-	gtk_object_set_data(GTK_OBJECT(caller), E_FILT_DIALOG_PTR_KEY,
-	    filter_browse_w);
+	OBJECT_SET_DATA(caller, E_FILT_DIALOG_PTR_KEY, filter_browse_w);
 }
 #endif
 
@@ -167,8 +165,7 @@ display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr)
 
 	/* Has a filter dialog box already been opened for that top-level
 	   widget? */
-	filter_browse_w = gtk_object_get_data(GTK_OBJECT(caller),
-	    E_FILT_DIALOG_PTR_KEY);
+	filter_browse_w = OBJECT_GET_DATA(caller, E_FILT_DIALOG_PTR_KEY);
 
 	if (filter_browse_w != NULL) {
 		/* Yes.  Just re-activate that dialog box. */
@@ -177,7 +174,7 @@ display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr)
 	}
 
 	/* No.  Get the text entry attached to the button. */
-	parent_filter_te = gtk_object_get_data(GTK_OBJECT(w), E_FILT_TE_PTR_KEY);
+	parent_filter_te = OBJECT_GET_DATA(w, E_FILT_TE_PTR_KEY);
 
 	/* Now create a new dialog, possibly with an "Apply" button, and
 	   definitely with an "Add Expression..." button. */
@@ -186,12 +183,10 @@ display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr)
 
 	/* Set the E_FILT_CALLER_PTR_KEY for the new dialog to point to
 	   our caller. */
-	gtk_object_set_data(GTK_OBJECT(filter_browse_w), E_FILT_CALLER_PTR_KEY,
-	    caller);
+	OBJECT_SET_DATA(filter_browse_w, E_FILT_CALLER_PTR_KEY, caller);
 
 	/* Set the E_FILT_DIALOG_PTR_KEY for the caller to point to us */
-	gtk_object_set_data(GTK_OBJECT(caller), E_FILT_DIALOG_PTR_KEY,
-	    filter_browse_w);
+	OBJECT_SET_DATA(caller, E_FILT_DIALOG_PTR_KEY, filter_browse_w);
 }
 
 #ifdef HAVE_LIBPCAP
@@ -344,13 +339,14 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
     static filter_list_type_t cfilter_list = CFILTER_LIST;
     static filter_list_type_t dfilter_list = DFILTER_LIST;
     filter_list_type_t *filter_list_p;
-    gchar      *filter_te_str = NULL;
     GList     **filter_dialogs;
 #if GTK_MAJOR_VERSION < 2
+    gchar      *filter_te_str = NULL;
     GtkWidget  *nl_item,
                *nl_lb,
                *l_select = NULL;
 #else
+    const gchar       *filter_te_str = NULL;
     gboolean           l_select = FALSE;
     GtkListStore      *store;
     GtkCellRenderer   *renderer;
@@ -382,18 +378,11 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
     }
 
     main_w = dlg_window_new(construct_args->title);
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY,
-                        construct_args);
+    OBJECT_SET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY, construct_args);
 
     /* Call a handler when we're destroyed, so we can inform
        our caller, if any, that we've been destroyed. */
-#if GTK_MAJOR_VERSION < 2
-    gtk_signal_connect(GTK_OBJECT(main_w), "destroy",
-                       GTK_SIGNAL_FUNC(filter_dlg_destroy), filter_list_p);
-#else
-    g_signal_connect(G_OBJECT(main_w), "destroy",
-                     G_CALLBACK(filter_dlg_destroy), filter_list_p);
-#endif
+    SIGNAL_CONNECT(main_w, "destroy", filter_dlg_destroy, filter_list_p);
 
     main_vb = gtk_vbox_new(FALSE, 5);
     gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
@@ -421,75 +410,43 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
 
 #if GTK_MAJOR_VERSION < 2
     new_bt = gtk_button_new_with_label ("New");
-    gtk_signal_connect(GTK_OBJECT(new_bt), "clicked",
-                       GTK_SIGNAL_FUNC(filter_new_bt_clicked_cb),
-                       filter_list_p);
 #else
     new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW);
-    g_signal_connect(G_OBJECT(new_bt), "clicked",
-                     G_CALLBACK(filter_new_bt_clicked_cb), filter_list_p);
 #endif
+    SIGNAL_CONNECT(new_bt, "clicked", filter_new_bt_clicked_cb, filter_list_p);
     gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
     gtk_widget_show(new_bt);
 
     chg_bt = gtk_button_new_with_label ("Change");
     gtk_widget_set_sensitive(chg_bt, FALSE);
-#if GTK_MAJOR_VERSION < 2
-    gtk_signal_connect(GTK_OBJECT(chg_bt), "clicked",
-                       GTK_SIGNAL_FUNC(filter_chg_bt_clicked_cb),
-                       filter_list_p);
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_CHG_BT_KEY, chg_bt);
-    gtk_signal_connect(GTK_OBJECT(chg_bt), "destroy",
-                       GTK_SIGNAL_FUNC(filter_chg_bt_destroy_cb), NULL);
-#else
-    g_signal_connect(G_OBJECT(chg_bt), "clicked",
-                     G_CALLBACK(filter_chg_bt_clicked_cb), filter_list_p);
-    g_object_set_data(G_OBJECT(main_w), E_FILT_CHG_BT_KEY, chg_bt);
-    g_signal_connect(G_OBJECT(chg_bt), "destroy",
-                     G_CALLBACK(filter_chg_bt_destroy_cb), NULL);
-#endif
+    SIGNAL_CONNECT(chg_bt, "clicked", filter_chg_bt_clicked_cb, filter_list_p);
+    OBJECT_SET_DATA(main_w, E_FILT_CHG_BT_KEY, chg_bt);
+    SIGNAL_CONNECT(chg_bt, "destroy", filter_chg_bt_destroy_cb, NULL);
     gtk_container_add(GTK_CONTAINER(list_bb), chg_bt);
     gtk_widget_show(chg_bt);
 
 #if GTK_MAJOR_VERSION < 2
     copy_bt = gtk_button_new_with_label ("Copy");
-    gtk_widget_set_sensitive(copy_bt, FALSE);
-    gtk_signal_connect(GTK_OBJECT(copy_bt), "clicked",
-                       GTK_SIGNAL_FUNC(filter_copy_bt_clicked_cb),
-                       filter_list_p);
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_COPY_BT_KEY, copy_bt);
-    gtk_signal_connect(GTK_OBJECT(copy_bt), "destroy",
-                       GTK_SIGNAL_FUNC(filter_copy_bt_destroy_cb), NULL);
 #else
     copy_bt = gtk_button_new_from_stock(GTK_STOCK_COPY);
-    gtk_widget_set_sensitive(copy_bt, FALSE);
-    g_signal_connect(G_OBJECT(copy_bt), "clicked",
-                     G_CALLBACK(filter_copy_bt_clicked_cb), filter_list_p);
-    g_object_set_data(G_OBJECT(main_w), E_FILT_COPY_BT_KEY, copy_bt);
-    g_signal_connect(G_OBJECT(copy_bt), "destroy",
-                     G_CALLBACK(filter_copy_bt_destroy_cb), NULL);
 #endif
+    gtk_widget_set_sensitive(copy_bt, FALSE);
+    SIGNAL_CONNECT(copy_bt, "clicked", filter_copy_bt_clicked_cb,
+                   filter_list_p);
+    OBJECT_SET_DATA(main_w, E_FILT_COPY_BT_KEY, copy_bt);
+    SIGNAL_CONNECT(copy_bt, "destroy", filter_copy_bt_destroy_cb, NULL);
     gtk_container_add(GTK_CONTAINER(list_bb), copy_bt);
     gtk_widget_show(copy_bt);
 
 #if GTK_MAJOR_VERSION < 2
     del_bt = gtk_button_new_with_label ("Delete");
-    gtk_widget_set_sensitive(del_bt, FALSE);
-    gtk_signal_connect(GTK_OBJECT(del_bt), "clicked",
-                       GTK_SIGNAL_FUNC(filter_del_bt_clicked_cb),
-                       filter_list_p);
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt);
-    gtk_signal_connect(GTK_OBJECT(del_bt), "destroy",
-                       GTK_SIGNAL_FUNC(filter_del_bt_destroy_cb), NULL);
 #else
     del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE);
-    gtk_widget_set_sensitive(del_bt, FALSE);
-    g_signal_connect(G_OBJECT(del_bt), "clicked",
-                     G_CALLBACK(filter_del_bt_clicked_cb), filter_list_p);
-    g_object_set_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt);
-    g_signal_connect(G_OBJECT(del_bt), "destroy",
-                     G_CALLBACK(filter_del_bt_destroy_cb), NULL);
 #endif
+    gtk_widget_set_sensitive(del_bt, FALSE);
+    SIGNAL_CONNECT(del_bt, "clicked", filter_del_bt_clicked_cb, filter_list_p);
+    OBJECT_SET_DATA(main_w, E_FILT_DEL_BT_KEY, del_bt);
+    SIGNAL_CONNECT(del_bt, "destroy", filter_del_bt_destroy_cb, NULL);
     gtk_container_add(GTK_CONTAINER(list_bb), del_bt);
     gtk_widget_show(del_bt);
 
@@ -497,13 +454,7 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
         /* Create the "Add Expression..." button, to pop up a dialog
            for constructing filter comparison expressions. */
         add_expression_bt = gtk_button_new_with_label("Add Expression...");
-#if GTK_MAJOR_VERSION < 2
-        gtk_signal_connect(GTK_OBJECT(add_expression_bt), "clicked",
-                           GTK_SIGNAL_FUNC(filter_expr_cb), main_w);
-#else
-        g_signal_connect(G_OBJECT(add_expression_bt), "clicked",
-                         G_CALLBACK(filter_expr_cb), main_w);
-#endif
+        SIGNAL_CONNECT(add_expression_bt, "clicked", filter_expr_cb, main_w);
         gtk_container_add(GTK_CONTAINER(list_bb), add_expression_bt);
         gtk_widget_show(add_expression_bt);
     }
@@ -511,24 +462,15 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
     filter_sc = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(filter_sc),
                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#if GTK_MAJOR_VERSION < 2
-    gtk_widget_set_usize(filter_sc, 250, 150);
-#else
-    gtk_widget_set_size_request(filter_sc, 250, 150);
-#endif
+    WIDGET_SET_SIZE(filter_sc, 250, 150);
     gtk_container_add(GTK_CONTAINER(top_hb), filter_sc);
     gtk_widget_show(filter_sc);
 
 #if GTK_MAJOR_VERSION < 2
     filter_l = gtk_list_new();
     gtk_list_set_selection_mode(GTK_LIST(filter_l), GTK_SELECTION_SINGLE);
-    gtk_signal_connect(GTK_OBJECT(filter_l), "selection_changed",
-                       GTK_SIGNAL_FUNC(filter_sel_list_cb), filter_pg);
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_FILTER_L_KEY, filter_l);
-    gtk_signal_connect(GTK_OBJECT(filter_l), "destroy",
-                       GTK_SIGNAL_FUNC(filter_list_destroy_cb), NULL);
-    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(filter_sc),
-                                          filter_l);
+    SIGNAL_CONNECT(filter_l, "selection_changed", filter_sel_list_cb,
+                   filter_pg);
 #else
     store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
     filter_l = tree_view_new(GTK_TREE_MODEL(store));
@@ -540,34 +482,26 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
     gtk_tree_view_append_column(GTK_TREE_VIEW(filter_l), column);
     sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(filter_l));
     gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
-    g_signal_connect(G_OBJECT(sel), "changed",
-                     G_CALLBACK(filter_sel_list_cb), filter_pg);
-    g_object_set_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY, filter_l);
-    g_signal_connect(G_OBJECT(filter_l), "destroy",
-                     G_CALLBACK(filter_list_destroy_cb), NULL);
-    g_signal_connect(G_OBJECT(filter_l), "button_press_event",
-                     G_CALLBACK(filter_sel_list_button_cb), NULL);
+    SIGNAL_CONNECT(sel, "changed", filter_sel_list_cb, filter_pg);
+    SIGNAL_CONNECT(filter_l, "button_press_event", filter_sel_list_button_cb,
+                   NULL);
+#endif
+    OBJECT_SET_DATA(main_w, E_FILT_FILTER_L_KEY, filter_l);
+    SIGNAL_CONNECT(filter_l, "destroy", filter_list_destroy_cb, NULL);
+#if GTK_MAJOR_VERSION < 2
+    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(filter_sc),
+                                          filter_l);
+#else
     gtk_container_add(GTK_CONTAINER(filter_sc), filter_l);
 #endif
     gtk_widget_show(filter_l);
 
-#if GTK_MAJOR_VERSION < 2
-    gtk_object_set_data(GTK_OBJECT(filter_l), E_FILT_DBLFUNC_KEY,
-                        filter_dlg_dclick);
-    gtk_object_set_data(GTK_OBJECT(filter_l), E_FILT_DBLARG_KEY, main_w);
-    /* This is a Boolean, but we make it a non-null pointer for TRUE
-       and a null pointer for FALSE, as object data is a pointer. */
-    gtk_object_set_data(GTK_OBJECT(filter_l), E_FILT_DBLACTIVATE_KEY,
-                        construct_args->activate_on_ok ? "" : NULL);
-#else
-    g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLFUNC_KEY,
-                      filter_dlg_dclick);
-    g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLARG_KEY, main_w);
+    OBJECT_SET_DATA(filter_l, E_FILT_DBLFUNC_KEY, filter_dlg_dclick);
+    OBJECT_SET_DATA(filter_l, E_FILT_DBLARG_KEY, main_w);
     /* This is a Boolean, but we make it a non-null pointer for TRUE
        and a null pointer for FALSE, as object data is a pointer. */
-    g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLACTIVATE_KEY,
-                      construct_args->activate_on_ok ? "" : NULL);
-#endif
+    OBJECT_SET_DATA(filter_l, E_FILT_DBLACTIVATE_KEY,
+                    construct_args->activate_on_ok ? "" : NULL);
 
     fl_entry = get_filter_list_first(list);
     while (fl_entry != NULL) {
@@ -576,17 +510,16 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
         nl_lb   = gtk_label_new(filt->name);
         nl_item = gtk_list_item_new();
 
-        gtk_signal_connect(GTK_OBJECT(nl_item), "button_press_event",
-                           GTK_SIGNAL_FUNC(filter_sel_list_button_cb), filter_l);
+        SIGNAL_CONNECT(nl_item, "button_press_event", filter_sel_list_button_cb,
+                       filter_l);
 
         gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
         gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
         gtk_widget_show(nl_lb);
         gtk_container_add(GTK_CONTAINER(filter_l), nl_item);
         gtk_widget_show(nl_item);
-        gtk_object_set_data(GTK_OBJECT(nl_item), E_FILT_LBL_KEY, nl_lb);
-        gtk_object_set_data(GTK_OBJECT(nl_item), E_FILT_LIST_ITEM_MODEL_KEY,
-                            fl_entry);
+        OBJECT_SET_DATA(nl_item, E_FILT_LBL_KEY, nl_lb);
+        OBJECT_SET_DATA(nl_item, E_FILT_LIST_ITEM_MODEL_KEY, fl_entry);
 #else
         gtk_list_store_append(store, &iter);
         gtk_list_store_set(store, &iter, 0, filt->name,
@@ -621,15 +554,8 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
 
     name_te = gtk_entry_new();
     gtk_box_pack_start(GTK_BOX(middle_hb), name_te, TRUE, TRUE, 3);
-#if GTK_MAJOR_VERSION < 2 
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_NAME_TE_KEY, name_te);
-    gtk_signal_connect(GTK_OBJECT(name_te), "destroy",
-                       GTK_SIGNAL_FUNC(filter_name_te_destroy_cb), NULL);
-#else
-    g_object_set_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY, name_te);
-    g_signal_connect(G_OBJECT(name_te), "destroy",
-                     G_CALLBACK(filter_name_te_destroy_cb), NULL);
-#endif
+    OBJECT_SET_DATA(main_w, E_FILT_NAME_TE_KEY, name_te);
+    SIGNAL_CONNECT(name_te, "destroy", filter_name_te_destroy_cb, NULL);
     gtk_widget_show(name_te);
 
     /* Bottom row: Filter text entry */
@@ -643,17 +569,9 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
 
     filter_te = gtk_entry_new();
     gtk_box_pack_start(GTK_BOX(bottom_hb), filter_te, TRUE, TRUE, 3);
-#if GTK_MAJOR_VERSION < 2 
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_FILTER_TE_KEY, filter_te);
+    OBJECT_SET_DATA(main_w, E_FILT_FILTER_TE_KEY, filter_te);
 
-    gtk_signal_connect(GTK_OBJECT(filter_te), "destroy",
-                       GTK_SIGNAL_FUNC(filter_filter_te_destroy_cb), NULL);
-#else
-    g_object_set_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY, filter_te);
-
-    g_signal_connect(G_OBJECT(filter_te), "destroy",
-                     G_CALLBACK(filter_filter_te_destroy_cb), NULL);
-#endif
+    SIGNAL_CONNECT(filter_te, "destroy", filter_filter_te_destroy_cb, NULL);
     gtk_widget_show(filter_te);
 
 #if GTK_MAJOR_VERSION < 2 
@@ -671,13 +589,7 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
 #endif
 
     gtk_box_pack_start(GTK_BOX(main_vb), filter_pg, TRUE, TRUE, 0);
-#if GTK_MAJOR_VERSION < 2 
-    gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY,
-                        parent_filter_te);
-#else
-    g_object_set_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY,
-                      parent_filter_te);
-#endif
+    OBJECT_SET_DATA(main_w, E_FILT_PARENT_FILTER_TE_KEY, parent_filter_te);
 
     bbox = gtk_hbutton_box_new();
     gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
@@ -692,13 +604,10 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
          */
 #if GTK_MAJOR_VERSION < 2
         ok_bt = gtk_button_new_with_label ("OK");
-        gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-                           GTK_SIGNAL_FUNC(filter_dlg_ok_cb), NULL);
 #else
         ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-        g_signal_connect(G_OBJECT(ok_bt), "clicked",
-                         G_CALLBACK(filter_dlg_ok_cb), NULL);
 #endif
+        SIGNAL_CONNECT(ok_bt, "clicked", filter_dlg_ok_cb, NULL);
         GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), ok_bt, TRUE, TRUE, 0);
         gtk_widget_grab_default(ok_bt);
@@ -716,13 +625,10 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
     if (construct_args->wants_apply_button) {
 #if GTK_MAJOR_VERSION < 2
         apply_bt = gtk_button_new_with_label ("Apply");
-        gtk_signal_connect(GTK_OBJECT(apply_bt), "clicked",
-                           GTK_SIGNAL_FUNC(filter_dlg_apply_cb), NULL);
 #else
         apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-        g_signal_connect(G_OBJECT(apply_bt), "clicked",
-                         G_CALLBACK(filter_dlg_apply_cb), NULL);
 #endif
+        SIGNAL_CONNECT(apply_bt, "clicked", filter_dlg_apply_cb, NULL);
         GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), apply_bt, TRUE, TRUE, 0);
         gtk_widget_show(apply_bt);
@@ -730,27 +636,20 @@ filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te,
 
 #if GTK_MAJOR_VERSION < 2
     save_bt = gtk_button_new_with_label ("Save");
-    gtk_signal_connect(GTK_OBJECT(save_bt), "clicked",
-                       GTK_SIGNAL_FUNC(filter_dlg_save_cb), filter_list_p);
 #else
     save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-    g_signal_connect(G_OBJECT(save_bt), "clicked",
-                     G_CALLBACK(filter_dlg_save_cb), filter_list_p);
 #endif
+    SIGNAL_CONNECT(save_bt, "clicked", filter_dlg_save_cb, filter_list_p);
     GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), save_bt, TRUE, TRUE, 0);
     gtk_widget_show(save_bt);
 
 #if GTK_MAJOR_VERSION < 2
     close_bt = gtk_button_new_with_label ("Close");
-    gtk_signal_connect(GTK_OBJECT(close_bt), "clicked",
-                       GTK_SIGNAL_FUNC(filter_dlg_close_cb),
-                       GTK_OBJECT(main_w));
 #else
     close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-    g_signal_connect(G_OBJECT(close_bt), "clicked",
-                     G_CALLBACK(filter_dlg_close_cb), G_OBJECT(main_w));
 #endif
+    SIGNAL_CONNECT(close_bt, "clicked", filter_dlg_close_cb, main_w);
     GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), close_bt, TRUE, TRUE, 0);
     gtk_widget_show(close_bt);
@@ -774,7 +673,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate)
 {
     GtkWidget  *main_w = GTK_WIDGET(main_w_arg);
     GtkWidget  *parent_filter_te =
-        gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
+        OBJECT_GET_DATA(main_w, E_FILT_PARENT_FILTER_TE_KEY);
     GList      *flp;
     filter_def *filt;
 #if GTK_MAJOR_VERSION < 2
@@ -804,7 +703,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate)
              */
 #if GTK_MAJOR_VERSION < 2
             l_item = GTK_OBJECT(sl->data);
-            flp = (GList *)gtk_object_get_data(l_item,
+            flp = (GList *)OBJECT_GET_DATA(l_item,
                                                E_FILT_LIST_ITEM_MODEL_KEY);
 #else
             gtk_tree_model_get(model, &iter, 1, &flp, -1);
@@ -825,13 +724,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate)
                     /*
                      * Yes - do so.
                      */
-#if GTK_MAJOR_VERSION < 2
-                    gtk_signal_emit_by_name(GTK_OBJECT(parent_filter_te),
-                                            "activate");
-#else
-                    g_signal_emit_by_name(G_OBJECT(parent_filter_te),
-                                          "activate");
-#endif
+                    SIGNAL_EMIT_BY_NAME(parent_filter_te, "activate");
                 }
             }
         }
@@ -862,11 +755,11 @@ static void
 filter_apply(GtkWidget *main_w, gboolean destroy)
 {
 	construct_args_t *construct_args =
-	    gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY);
-	GtkWidget  *parent_filter_te =
-	    gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY);
-	GtkWidget  *filter_te;
-	gchar      *filter_string;
+	    OBJECT_GET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY);
+	GtkWidget        *parent_filter_te =
+	    OBJECT_GET_DATA(main_w, E_FILT_PARENT_FILTER_TE_KEY);
+	GtkWidget        *filter_te;
+	const gchar      *filter_string;
 
 	if (parent_filter_te != NULL) {
 		/*
@@ -874,9 +767,9 @@ filter_apply(GtkWidget *main_w, gboolean destroy)
 		 * box; put the filter in our text entry widget into that
 		 * text entry widget.
 		 */
-		filter_te = gtk_object_get_data(GTK_OBJECT(main_w),
-		    E_FILT_FILTER_TE_KEY);
-		filter_string = gtk_entry_get_text(GTK_ENTRY(filter_te));
+		filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY);
+		filter_string =
+                    (const gchar *)gtk_entry_get_text(GTK_ENTRY(filter_te));
 		gtk_entry_set_text(GTK_ENTRY(parent_filter_te), filter_string);
 
 	}
@@ -909,13 +802,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy)
 		 * to destroy it.
 		 */
 		if (construct_args->activate_on_ok) {
-#if GTK_MAJOR_VERSION < 2
-			gtk_signal_emit_by_name(GTK_OBJECT(parent_filter_te),
-                                                "activate");
-#else
-                        g_signal_emit_by_name(G_OBJECT(parent_filter_te),
-                                              "activate");
-#endif
+			SIGNAL_EMIT_BY_NAME(parent_filter_te, "activate");
 		}
 	}
 }
@@ -979,12 +866,11 @@ filter_dlg_destroy(GtkWidget *win, gpointer data)
 	/* Get the widget that requested that we be popped up, if any.
 	   (It should arrange to destroy us if it's destroyed, so
 	   that we don't get a pointer to a non-existent window here.) */
-	caller = gtk_object_get_data(GTK_OBJECT(win), E_FILT_CALLER_PTR_KEY);
+	caller = OBJECT_GET_DATA(win, E_FILT_CALLER_PTR_KEY);
 
 	if (caller != NULL) {
 		/* Tell it we no longer exist. */
-		gtk_object_set_data(GTK_OBJECT(caller), E_FILT_DIALOG_PTR_KEY,
-		    NULL);
+		OBJECT_SET_DATA(caller, E_FILT_DIALOG_PTR_KEY, NULL);
 	} else {
 		/* This is an editing dialog popped up from, for example,
 		   a menu item; note that we no longer have one. */
@@ -1018,44 +904,32 @@ filter_dlg_destroy(GtkWidget *win, gpointer data)
 
 #if GTK_MAJOR_VERSION < 2
 static gint
-filter_sel_list_button_cb (GtkWidget *widget, GdkEventButton *event,
-                           gpointer func_data)
+filter_sel_list_button_cb(GtkWidget *widget, GdkEventButton *event,
+                          gpointer func_data)
 #else
 static gint
-filter_sel_list_button_cb (GtkWidget *list, GdkEventButton *event,
-                           gpointer data _U_)
+filter_sel_list_button_cb(GtkWidget *list, GdkEventButton *event,
+                          gpointer data _U_)
 #endif
 {
 #if GTK_MAJOR_VERSION < 2
-    GtkWidget *parent = func_data;
-    GtkSignalFunc func;
-#else
-    void (* func)(GtkWidget *, gpointer, gpointer);
+    GtkWidget *list = func_data;
 #endif
+    void (* func)(GtkWidget *, gpointer, gpointer);
     gpointer func_arg;
     gpointer func_activate;
 
 #if GTK_MAJOR_VERSION < 2
-    if (GTK_IS_LIST_ITEM(widget) && event->type == GDK_2BUTTON_PRESS) {
-        func = gtk_object_get_data(GTK_OBJECT(parent), E_FILT_DBLFUNC_KEY);
-        func_arg = gtk_object_get_data(GTK_OBJECT(parent), E_FILT_DBLARG_KEY);
-        func_activate = gtk_object_get_data(GTK_OBJECT(parent),
-                                            E_FILT_DBLACTIVATE_KEY);
-
-        if (func)
-            (*func)(func_data, func_arg, func_activate);
-    }
-#else
+    if (!GTK_IS_LIST_ITEM(widget)) return FALSE;
+#endif
     if (event->type == GDK_2BUTTON_PRESS) {
-        func = g_object_get_data(G_OBJECT(list), E_FILT_DBLFUNC_KEY);
-        func_arg = g_object_get_data(G_OBJECT(list), E_FILT_DBLARG_KEY);
-        func_activate = g_object_get_data(G_OBJECT(list),
-                                          E_FILT_DBLACTIVATE_KEY);
+        func = OBJECT_GET_DATA(list, E_FILT_DBLFUNC_KEY);
+        func_arg = OBJECT_GET_DATA(list, E_FILT_DBLARG_KEY);
+        func_activate = OBJECT_GET_DATA(list, E_FILT_DBLACTIVATE_KEY);
 
         if (func)
             (*func)(list, func_arg, func_activate);
     }
-#endif
 
     return FALSE;
 }
@@ -1078,16 +952,11 @@ filter_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_)
     GtkTreeModel *model;
     GtkTreeIter   iter;
 #endif
-    GtkWidget    *name_te = gtk_object_get_data(GTK_OBJECT(main_w),
-                                                E_FILT_NAME_TE_KEY);
-    GtkWidget    *filter_te = gtk_object_get_data(GTK_OBJECT(main_w),
-                                                  E_FILT_FILTER_TE_KEY);
-    GtkWidget    *chg_bt = gtk_object_get_data(GTK_OBJECT(main_w),
-                                               E_FILT_CHG_BT_KEY);
-    GtkWidget    *copy_bt = gtk_object_get_data(GTK_OBJECT(main_w),
-                                                E_FILT_COPY_BT_KEY);
-    GtkWidget    *del_bt = gtk_object_get_data(GTK_OBJECT(main_w),
-                                             E_FILT_DEL_BT_KEY);
+    GtkWidget    *name_te = OBJECT_GET_DATA(main_w, E_FILT_NAME_TE_KEY);
+    GtkWidget    *filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY);
+    GtkWidget    *chg_bt = OBJECT_GET_DATA(main_w, E_FILT_CHG_BT_KEY);
+    GtkWidget    *copy_bt = OBJECT_GET_DATA(main_w, E_FILT_COPY_BT_KEY);
+    GtkWidget    *del_bt = OBJECT_GET_DATA(main_w, E_FILT_DEL_BT_KEY);
     filter_def   *filt;
     gchar        *name = "", *strval = "";
     GList        *flp;
@@ -1101,7 +970,7 @@ filter_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_)
 
     if (sl) {  /* Something was selected */
         l_item = GTK_OBJECT(sl->data);
-        flp    = (GList *) gtk_object_get_data(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
+        flp    = (GList *) OBJECT_GET_DATA(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
 #else
     if (gtk_tree_selection_get_selected(sel, &model, &iter)) {
         gtk_tree_model_get(model, &iter, 1, &flp, -1);
@@ -1149,7 +1018,7 @@ filter_list_destroy_cb(GtkWidget *l, gpointer data _U_)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(l);
 
-  gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_FILTER_L_KEY, NULL);
+  OBJECT_SET_DATA(main_w, E_FILT_FILTER_L_KEY, NULL);
 }
 
 /* To do: add input checking to each of these callbacks */
@@ -1172,8 +1041,7 @@ new_filter_cb(gpointer data, gpointer user_data)
 {
     GtkWidget    *main_w = data;
 #if GTK_MAJOR_VERSION < 2
-    GtkWidget    *filter_l = gtk_object_get_data(GTK_OBJECT(main_w),
-                                                 E_FILT_FILTER_L_KEY);
+    GtkWidget    *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
     GtkWidget    *nl_lb, *nl_item;
 #else
     GtkTreeView  *filter_l;
@@ -1191,16 +1059,15 @@ new_filter_cb(gpointer data, gpointer user_data)
     gtk_widget_show(nl_lb);
     gtk_container_add(GTK_CONTAINER(filter_l), nl_item);
     gtk_widget_show(nl_item);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_FILT_LBL_KEY, nl_lb);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_FILT_LIST_ITEM_MODEL_KEY,
+    OBJECT_SET_DATA(nl_item, E_FILT_LBL_KEY, nl_lb);
+    OBJECT_SET_DATA(GTK_OBJECT(nl_item), E_FILT_LIST_ITEM_MODEL_KEY,
                         args->nflp);
     if (filter_l == args->active_filter_l) {
         /* Select the item. */
         gtk_list_select_child(GTK_LIST(filter_l), nl_item);
     }
 #else
-    filter_l = GTK_TREE_VIEW(gtk_object_get_data(GTK_OBJECT(main_w),
-                                                 E_FILT_FILTER_L_KEY));
+    filter_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY));
     store = GTK_LIST_STORE(gtk_tree_view_get_model(filter_l));
     gtk_list_store_append(store, &iter);
     gtk_list_store_set(store, &iter, 0, nfilt->name, 1, args->nflp, -1);
@@ -1216,9 +1083,9 @@ static void
 filter_new_bt_clicked_cb(GtkWidget *w, gpointer data)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-  GtkWidget  *name_te = gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_NAME_TE_KEY);
-  GtkWidget  *filter_te = gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_FILTER_TE_KEY);
-  GtkWidget  *filter_l = gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_FILTER_L_KEY);
+  GtkWidget  *name_te = OBJECT_GET_DATA(main_w, E_FILT_NAME_TE_KEY);
+  GtkWidget  *filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY);
+  GtkWidget  *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
   filter_list_type_t list = *(filter_list_type_t *)data;
   GList      *fl_entry;
   gchar      *name, *strval;
@@ -1259,9 +1126,9 @@ chg_list_item_cb(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
     filter_def *filt = flp->data;
 #if GTK_MAJOR_VERSION < 2
     GtkLabel   *nl_lb =
-        GTK_LABEL(gtk_object_get_data(GTK_OBJECT(nl_item), E_FILT_LBL_KEY));
+        GTK_LABEL(OBJECT_GET_DATA(nl_item, E_FILT_LBL_KEY));
     GList      *nl_model =
-        gtk_object_get_data(GTK_OBJECT(nl_item), E_FILT_LIST_ITEM_MODEL_KEY);
+        OBJECT_GET_DATA(nl_item, E_FILT_LIST_ITEM_MODEL_KEY);
 #else
     GList      *nl_model;
 #endif
@@ -1289,8 +1156,7 @@ static void
 chg_filter_cb(gpointer data, gpointer user_data)
 {
     GtkWidget  *main_w = data;
-    GtkWidget  *filter_l = gtk_object_get_data(GTK_OBJECT(main_w),
-                                               E_FILT_FILTER_L_KEY);
+    GtkWidget  *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
 
 #if GTK_MAJOR_VERSION < 2
     gtk_container_foreach(GTK_CONTAINER(filter_l), chg_list_item_cb, user_data);
@@ -1304,12 +1170,9 @@ static void
 filter_chg_bt_clicked_cb(GtkWidget *w, gpointer data)
 {
     GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-    GtkWidget  *name_te = gtk_object_get_data(GTK_OBJECT(main_w),
-                                              E_FILT_NAME_TE_KEY);
-    GtkWidget  *filter_te = gtk_object_get_data(GTK_OBJECT(main_w),
-                                                E_FILT_FILTER_TE_KEY);
-    GtkWidget  *filter_l = gtk_object_get_data(GTK_OBJECT(main_w),
-                                               E_FILT_FILTER_L_KEY);
+    GtkWidget  *name_te = OBJECT_GET_DATA(main_w, E_FILT_NAME_TE_KEY);
+    GtkWidget  *filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY);
+    GtkWidget  *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
     filter_def *filt;
     GList      *fl_entry;
     filter_list_type_t list = *(filter_list_type_t *)data;
@@ -1337,9 +1200,9 @@ filter_chg_bt_clicked_cb(GtkWidget *w, gpointer data)
 #if GTK_MAJOR_VERSION < 2
     if (sl) {
         l_item = GTK_OBJECT(sl->data);
-        fl_entry = (GList *) gtk_object_get_data(l_item,
+        fl_entry = (GList *) OBJECT_GET_DATA(l_item,
                                                  E_FILT_LIST_ITEM_MODEL_KEY);
-        nl_lb = (GtkLabel *) gtk_object_get_data(l_item, E_FILT_LBL_KEY);
+        nl_lb = (GtkLabel *) OBJECT_GET_DATA(l_item, E_FILT_LBL_KEY);
         if (fl_entry != NULL && nl_lb != NULL) {
 #else
     if (gtk_tree_selection_get_selected(sel, &model, &iter)) {
@@ -1368,15 +1231,14 @@ filter_chg_bt_destroy_cb(GtkWidget *chg_bt, gpointer data _U_)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(chg_bt);
 
-  gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_CHG_BT_KEY, NULL);
+  OBJECT_SET_DATA(main_w, E_FILT_CHG_BT_KEY, NULL);
 }
 
 static void
 filter_copy_bt_clicked_cb(GtkWidget *w, gpointer data)
 {
     GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-    GtkWidget  *filter_l = gtk_object_get_data(GTK_OBJECT(main_w),
-                                               E_FILT_FILTER_L_KEY);
+    GtkWidget  *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
     GList      *fl_entry, *nfl_entry;
     gchar      *prefix = "Copy of ", *name;
     filter_def *filt;
@@ -1396,7 +1258,7 @@ filter_copy_bt_clicked_cb(GtkWidget *w, gpointer data)
     /* if something was selected */
     if (sl) {
         l_item = GTK_OBJECT(sl->data);
-        fl_entry = (GList *) gtk_object_get_data(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
+        fl_entry = (GList *) OBJECT_GET_DATA(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
 #else
     sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(filter_l));
     /* if something was selected */
@@ -1426,15 +1288,14 @@ filter_copy_bt_destroy_cb(GtkWidget *copy_bt, gpointer data _U_)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(copy_bt);
 
-  gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_COPY_BT_KEY, NULL);
+  OBJECT_SET_DATA(main_w, E_FILT_COPY_BT_KEY, NULL);
 }
 
 static void
 delete_filter_cb(gpointer data, gpointer user_data)
 {
     GtkWidget    *main_w = data;
-    GtkWidget    *filter_l = gtk_object_get_data(GTK_OBJECT(main_w),
-                                                 E_FILT_FILTER_L_KEY);
+    GtkWidget    *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
 #if GTK_MAJOR_VERSION < 2
     gint          pos = *(gint *)user_data;
 #else
@@ -1455,8 +1316,7 @@ static void
 filter_del_bt_clicked_cb(GtkWidget *w, gpointer data)
 {
     GtkWidget  *main_w = gtk_widget_get_toplevel(w);
-    GtkWidget  *filter_l = gtk_object_get_data(GTK_OBJECT(main_w),
-                                               E_FILT_FILTER_L_KEY);
+    GtkWidget  *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
     filter_list_type_t list = *(filter_list_type_t *)data;
     GList      *fl_entry;
 #if GTK_MAJOR_VERSION < 2
@@ -1477,7 +1337,7 @@ filter_del_bt_clicked_cb(GtkWidget *w, gpointer data)
         l_item = GTK_OBJECT(sl->data);
         pos    = gtk_list_child_position(GTK_LIST(filter_l),
                                          GTK_WIDGET(l_item));
-        fl_entry = (GList *) gtk_object_get_data(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
+        fl_entry = (GList *) OBJECT_GET_DATA(l_item, E_FILT_LIST_ITEM_MODEL_KEY);
 #else
     sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(filter_l));
     /* If something was selected */
@@ -1511,7 +1371,7 @@ filter_del_bt_destroy_cb(GtkWidget *del_bt, gpointer data _U_)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(del_bt);
 
-  gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_DEL_BT_KEY, NULL);
+  OBJECT_SET_DATA(main_w, E_FILT_DEL_BT_KEY, NULL);
 }
 
 static void
@@ -1520,8 +1380,7 @@ filter_expr_cb(GtkWidget *w _U_, gpointer main_w_arg)
 	GtkWidget  *main_w = GTK_WIDGET(main_w_arg);
 	GtkWidget  *filter_te;
 
-	filter_te = gtk_object_get_data(GTK_OBJECT(main_w),
-	    E_FILT_FILTER_TE_KEY);
+	filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY);
 	dfilter_expr_dlg_new(filter_te);
 }
 
@@ -1530,7 +1389,7 @@ filter_name_te_destroy_cb(GtkWidget *name_te, gpointer data _U_)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(name_te);
 
-  gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_NAME_TE_KEY, NULL);
+  OBJECT_SET_DATA(main_w, E_FILT_NAME_TE_KEY, NULL);
 }
 
 static void
@@ -1538,5 +1397,5 @@ filter_filter_te_destroy_cb(GtkWidget *filter_te, gpointer data _U_)
 {
   GtkWidget  *main_w = gtk_widget_get_toplevel(filter_te);
 
-  gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_FILTER_TE_KEY, NULL);
+  OBJECT_SET_DATA(main_w, E_FILT_FILTER_TE_KEY, NULL);
 }
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 17aff2fcc7..7228e361e6 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,7 +1,7 @@
 /* find_dlg.c
  * Routines for "find frame" window
  *
- * $Id: find_dlg.c,v 1.25 2002/11/03 17:38:33 oabad Exp $
+ * $Id: find_dlg.c,v 1.26 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,6 +38,7 @@
 #include "filter_prefs.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
+#include "compat_macros.h"
 
 /* Capture callback data keys */
 #define E_FIND_FILT_KEY     "find_filter_te"
@@ -84,18 +85,14 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   }
 
   find_frame_w = dlg_window_new("Ethereal: Find Frame");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(find_frame_w), "destroy",
-                     GTK_SIGNAL_FUNC(find_frame_destroy_cb), NULL);
+  SIGNAL_CONNECT(find_frame_w, "destroy", find_frame_destroy_cb, NULL);
 
+#if GTK_MAJOR_VERSION < 2
   /* Accelerator group for the accelerators (or, as they're called in
      Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
      Ctrl+<key> is an accelerator). */
   accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(GTK_WINDOW(find_frame_w), accel_group);
-#else
-  g_signal_connect(G_OBJECT(find_frame_w), "destroy",
-                   G_CALLBACK(find_frame_destroy_cb), NULL);
 #endif
 
   /* Container for each row of widgets */
@@ -110,19 +107,13 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_show(filter_hb);
 
   filter_bt = gtk_button_new_with_label("Filter:");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
-                     GTK_SIGNAL_FUNC(display_filter_construct_cb), &args);
-#else
-  g_signal_connect(G_OBJECT(filter_bt), "clicked",
-                   G_CALLBACK(display_filter_construct_cb), &args);
-#endif
+  SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
   gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0);
   gtk_widget_show(filter_bt);
 
   filter_te = gtk_entry_new();
   if (cfile.sfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.sfilter);
-  gtk_object_set_data(GTK_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
+  OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te);
   gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 0);
   gtk_widget_show(filter_te);
 
@@ -162,14 +153,10 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
 #if GTK_MAJOR_VERSION < 2
   ok_bt = gtk_button_new_with_label ("OK");
-  gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-                     GTK_SIGNAL_FUNC(find_frame_ok_cb),
-                     GTK_OBJECT(find_frame_w));
 #else
   ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_signal_connect(G_OBJECT(ok_bt), "clicked",
-                   G_CALLBACK(find_frame_ok_cb), G_OBJECT(find_frame_w));
 #endif
+  SIGNAL_CONNECT(ok_bt, "clicked", find_frame_ok_cb, find_frame_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
@@ -177,21 +164,17 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
 #if GTK_MAJOR_VERSION < 2
   cancel_bt = gtk_button_new_with_label ("Cancel");
-  gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
-                     GTK_SIGNAL_FUNC(find_frame_close_cb),
-                     GTK_OBJECT(find_frame_w));
 #else
   cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  g_signal_connect(G_OBJECT(cancel_bt), "clicked",
-                   G_CALLBACK(find_frame_close_cb), G_OBJECT(find_frame_w));
 #endif
+  SIGNAL_CONNECT(cancel_bt, "clicked", find_frame_close_cb, find_frame_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
   gtk_widget_show(cancel_bt);
 
   /* Attach pointers to needed widgets to the capture prefs window/object */
-  gtk_object_set_data(GTK_OBJECT(find_frame_w), E_FIND_FILT_KEY, filter_te);
-  gtk_object_set_data(GTK_OBJECT(find_frame_w), E_FIND_BACKWARD_KEY, backward_rb);
+  OBJECT_SET_DATA(find_frame_w, E_FIND_FILT_KEY, filter_te);
+  OBJECT_SET_DATA(find_frame_w, E_FIND_BACKWARD_KEY, backward_rb);
 
   /* Catch the "activate" signal on the frame number text entry, so that
      if the user types Return there, we act as if the "OK" button
@@ -217,8 +200,8 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
   gchar     *filter_text;
   dfilter_t *sfcode;
 
-  filter_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_FIND_FILT_KEY);
-  backward_rb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_FIND_BACKWARD_KEY);
+  filter_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_FILT_KEY);
+  backward_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_BACKWARD_KEY);
 
   filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
 
@@ -271,7 +254,7 @@ find_frame_destroy_cb(GtkWidget *win, gpointer user_data _U_)
 
   /* Is there a filter edit/selection dialog associated with this
      Find Frame dialog? */
-  find_frame_filter_w = gtk_object_get_data(GTK_OBJECT(win), E_FILT_DIALOG_PTR_KEY);
+  find_frame_filter_w = OBJECT_GET_DATA(win, E_FILT_DIALOG_PTR_KEY);
 
   if (find_frame_filter_w != NULL) {
     /* Yes.  Destroy it. */
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 48ff9caddf..a07b00ab1e 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,7 +1,7 @@
 /* goto_dlg.c
  * Routines for "go to frame" window
  *
- * $Id: goto_dlg.c,v 1.18 2002/11/03 17:38:33 oabad Exp $
+ * $Id: goto_dlg.c,v 1.19 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,6 +35,7 @@
 #include "goto_dlg.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
+#include "compat_macros.h"
 
 /* Capture callback data keys */
 #define E_GOTO_FNUMBER_KEY     "goto_fnumber_te"
@@ -81,14 +82,10 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
 #if GTK_MAJOR_VERSION < 2
   ok_bt = gtk_button_new_with_label ("OK");
-  gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-                     GTK_SIGNAL_FUNC(goto_frame_ok_cb),
-                     GTK_OBJECT(goto_frame_w));
 #else
   ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_signal_connect(G_OBJECT(ok_bt), "clicked",
-                   G_CALLBACK(goto_frame_ok_cb), G_OBJECT(goto_frame_w));
 #endif
+  SIGNAL_CONNECT(ok_bt, "clicked", goto_frame_ok_cb, goto_frame_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
@@ -96,20 +93,16 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
 #if GTK_MAJOR_VERSION < 2
   cancel_bt = gtk_button_new_with_label ("Cancel");
-  gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
-                     GTK_SIGNAL_FUNC(goto_frame_close_cb),
-                     GTK_OBJECT(goto_frame_w));
 #else
   cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  g_signal_connect(G_OBJECT(cancel_bt), "clicked",
-                   G_CALLBACK(goto_frame_close_cb), G_OBJECT(goto_frame_w));
 #endif
+  SIGNAL_CONNECT(cancel_bt, "clicked", goto_frame_close_cb, goto_frame_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
   gtk_widget_show(cancel_bt);
 
   /* Attach pointers to needed widgets to the capture prefs window/object */
-  gtk_object_set_data(GTK_OBJECT(goto_frame_w), E_GOTO_FNUMBER_KEY, fnumber_te);
+  OBJECT_SET_DATA(goto_frame_w, E_GOTO_FNUMBER_KEY, fnumber_te);
 
   /* Catch the "activate" signal on the frame number text entry, so that
      if the user types Return there, we act as if the "OK" button
@@ -136,7 +129,7 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
   guint        fnumber;
   char        *p;
 
-  fnumber_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_GOTO_FNUMBER_KEY);
+  fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_GOTO_FNUMBER_KEY);
 
   fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
   fnumber = strtoul(fnumber_text, &p, 10);
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 2da7a34415..6a181296eb 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
 /* gui_prefs.c
  * Dialog box for GUI preferences
  *
- * $Id: gui_prefs.c,v 1.37 2002/11/03 17:38:33 oabad Exp $
+ * $Id: gui_prefs.c,v 1.38 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,6 +42,7 @@
 #include "dlg_utils.h"
 #include "proto_draw.h"
 #include "main.h"
+#include "compat_macros.h"
 
 static void font_browse_cb(GtkWidget *w, gpointer data);
 static void font_browse_ok_cb(GtkWidget *w, GtkFontSelectionDialog *fs);
@@ -173,86 +174,72 @@ gui_prefs_show(void)
 	scrollbar_om = create_preference_option_menu(main_tb, pos++,
 	    "Vertical scrollbar placement:", NULL, scrollbar_placement_vals,
 	    prefs.gui_scrollbar_on_right);
-	gtk_object_set_data(GTK_OBJECT(main_vb), SCROLLBAR_PLACEMENT_KEY,
-	    scrollbar_om);
+	OBJECT_SET_DATA(main_vb, SCROLLBAR_PLACEMENT_KEY, scrollbar_om);
 
 	/* Packet list selection browseable */
 	plist_browse_om = create_preference_option_menu(main_tb, pos++,
 	    "Packet list mouse behavior:", NULL, selection_mode_vals,
 	    prefs.gui_plist_sel_browse);
-	gtk_object_set_data(GTK_OBJECT(main_vb), PLIST_SEL_BROWSE_KEY,
-	    plist_browse_om);
+	OBJECT_SET_DATA(main_vb, PLIST_SEL_BROWSE_KEY, plist_browse_om);
 
 	/* Proto tree selection browseable */
 	ptree_browse_om = create_preference_option_menu(main_tb, pos++,
 	    "Protocol tree mouse behavior:", NULL, selection_mode_vals,
 	    prefs.gui_ptree_sel_browse);
-	gtk_object_set_data(GTK_OBJECT(main_vb), PTREE_SEL_BROWSE_KEY,
-	    ptree_browse_om);
+	OBJECT_SET_DATA(main_vb, PTREE_SEL_BROWSE_KEY, ptree_browse_om);
 
 #if GTK_MAJOR_VERSION < 2
 	/* Tree line style */
 	line_style_om = create_preference_option_menu(main_tb, pos++,
 	    "Tree line style:", NULL, line_style_vals,
 	    prefs.gui_ptree_line_style);
-	gtk_object_set_data(GTK_OBJECT(main_vb), PTREE_LINE_STYLE_KEY,
-	    line_style_om);
+	OBJECT_SET_DATA(main_vb, PTREE_LINE_STYLE_KEY, line_style_om);
 
 	/* Tree expander style */
 	expander_style_om = create_preference_option_menu(main_tb, pos++,
 	    "Tree expander style:", NULL, expander_style_vals,
 	    prefs.gui_ptree_expander_style);
-	gtk_object_set_data(GTK_OBJECT(main_vb), PTREE_EXPANDER_STYLE_KEY,
-	    expander_style_om);
+	OBJECT_SET_DATA(main_vb, PTREE_EXPANDER_STYLE_KEY, expander_style_om);
 #else
         /* Alternating row colors in list and tree views */
 	altern_colors_om = create_preference_option_menu(main_tb, pos++,
 	    "Alternating row colors in lists and trees:", NULL,
             altern_colors_vals, prefs.gui_altern_colors);
-	gtk_object_set_data(GTK_OBJECT(main_vb), ALTERN_COLORS_KEY,
-	    altern_colors_om);
+	OBJECT_SET_DATA(main_vb, ALTERN_COLORS_KEY, altern_colors_om);
 #endif
 
 	/* Hex Dump highlight style */
 	highlight_style_om = create_preference_option_menu(main_tb, pos++,
 	    "Hex display highlight style:", NULL, highlight_style_vals,
 	    prefs.gui_hex_dump_highlight_style);
-	gtk_object_set_data(GTK_OBJECT(main_vb), HEX_DUMP_HIGHLIGHT_STYLE_KEY,
-	    highlight_style_om);
+	OBJECT_SET_DATA(main_vb, HEX_DUMP_HIGHLIGHT_STYLE_KEY,
+                        highlight_style_om);
 
 	/* Geometry prefs */
 	save_position_cb = create_preference_check_button(main_tb, pos++,
             "Save window position:", NULL, prefs.gui_geometry_save_position);
-	gtk_object_set_data(GTK_OBJECT(main_vb), GEOMETRY_POSITION_KEY,
-	    save_position_cb);
+	OBJECT_SET_DATA(main_vb, GEOMETRY_POSITION_KEY, save_position_cb);
 
 	save_size_cb = create_preference_check_button(main_tb, pos++,
 	    "Save window size:", NULL, prefs.gui_geometry_save_size);
-	gtk_object_set_data(GTK_OBJECT(main_vb), GEOMETRY_SIZE_KEY,
-	    save_size_cb);
+	OBJECT_SET_DATA(main_vb, GEOMETRY_SIZE_KEY, save_size_cb);
 
 	/* "Font..." button - click to open a font selection dialog box. */
 #if GTK_MAJOR_VERSION < 2
 	font_bt = gtk_button_new_with_label("Font...");
-	gtk_signal_connect(GTK_OBJECT(font_bt), "clicked",
-                           GTK_SIGNAL_FUNC(font_browse_cb), NULL);
 #else
         font_bt = gtk_button_new_from_stock(GTK_STOCK_SELECT_FONT);
-	g_signal_connect(G_OBJECT(font_bt), "clicked",
-                         G_CALLBACK(font_browse_cb), NULL);
 #endif
+	SIGNAL_CONNECT(font_bt, "clicked", font_browse_cb, NULL);
 	gtk_table_attach_defaults( GTK_TABLE(main_tb), font_bt, 2, 3, 0, 1 );
 
 	/* "Colors..." button - click to open a color selection dialog box. */
 #if GTK_MAJOR_VERSION < 2
 	color_bt = gtk_button_new_with_label("Colors...");
-	gtk_signal_connect(GTK_OBJECT(color_bt), "clicked",
-                           GTK_SIGNAL_FUNC(color_browse_cb), NULL);
 #else
         color_bt = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
-	g_signal_connect(G_OBJECT(color_bt), "clicked",
-                         G_CALLBACK(color_browse_cb), NULL);
 #endif
+	SIGNAL_CONNECT(color_bt, "clicked", color_browse_cb, NULL);
 	gtk_table_attach_defaults( GTK_TABLE(main_tb), color_bt, 2, 3, 1, 2 );
 
 	/* Show 'em what we got */
@@ -273,8 +260,7 @@ font_browse_cb(GtkWidget *w, gpointer data _U_)
 
 	/* Has a font dialog box already been opened for that top-level
 	   widget? */
-	font_browse_w = gtk_object_get_data(GTK_OBJECT(caller),
-	    FONT_DIALOG_PTR_KEY);
+	font_browse_w = OBJECT_GET_DATA(caller, FONT_DIALOG_PTR_KEY);
 
 	if (font_browse_w != NULL) {
 		/* Yes.  Just re-activate that dialog box. */
@@ -289,13 +275,7 @@ font_browse_cb(GtkWidget *w, gpointer data _U_)
 
 	/* Call a handler when we're destroyed, so we can inform
 	   our caller, if any, that we've been destroyed. */
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(font_browse_w), "destroy",
-                           GTK_SIGNAL_FUNC(font_browse_destroy), NULL);
-#else
-        g_signal_connect(G_OBJECT(font_browse_w), "destroy",
-                         G_CALLBACK(font_browse_destroy), NULL);
-#endif
+	SIGNAL_CONNECT(font_browse_w, "destroy", font_browse_destroy, NULL);
 
 #if GTK_MAJOR_VERSION < 2
 	/* Set its filter to show only fixed_width fonts. */
@@ -320,46 +300,22 @@ font_browse_cb(GtkWidget *w, gpointer data _U_)
 	gtk_font_selection_dialog_set_font_name(
 	    GTK_FONT_SELECTION_DIALOG(font_browse_w), prefs.gui_font_name);
 
-#if GTK_MAJOR_VERSION < 2
-	/* Set the FONT_CALLER_PTR_KEY for the new dialog to point to
-	   our caller. */
-	gtk_object_set_data(GTK_OBJECT(font_browse_w), FONT_CALLER_PTR_KEY,
-                            caller);
-
-	/* Set the FONT_DIALOG_PTR_KEY for the caller to point to us */
-	gtk_object_set_data(GTK_OBJECT(caller), FONT_DIALOG_PTR_KEY,
-                            font_browse_w);
-
-	/* Connect the ok_button to font_browse_ok_cb function and pass along a
-	   pointer to the font selection box widget */
-	gtk_signal_connect(
-	    GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_browse_w)->ok_button),
-	    "clicked", (GtkSignalFunc)font_browse_ok_cb, font_browse_w);
-
-	/* Connect the cancel_button to destroy the widget */
-	gtk_signal_connect_object(
-	    GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_browse_w)->cancel_button),
-	    "clicked", (GtkSignalFunc)gtk_widget_destroy,
-	    GTK_OBJECT(font_browse_w));
-#else
 	/* Set the FONT_CALLER_PTR_KEY for the new dialog to point to
 	   our caller. */
-	g_object_set_data(G_OBJECT(font_browse_w), FONT_CALLER_PTR_KEY, caller);
+	OBJECT_SET_DATA(font_browse_w, FONT_CALLER_PTR_KEY, caller);
 
 	/* Set the FONT_DIALOG_PTR_KEY for the caller to point to us */
-	g_object_set_data(G_OBJECT(caller), FONT_DIALOG_PTR_KEY, font_browse_w);
+	OBJECT_SET_DATA(caller, FONT_DIALOG_PTR_KEY, font_browse_w);
 
 	/* Connect the ok_button to font_browse_ok_cb function and pass along a
 	   pointer to the font selection box widget */
-	g_signal_connect(
-	    G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_browse_w)->ok_button),
-	    "clicked", G_CALLBACK(font_browse_ok_cb), font_browse_w);
+	SIGNAL_CONNECT(GTK_FONT_SELECTION_DIALOG(font_browse_w)->ok_button,
+                       "clicked", font_browse_ok_cb, font_browse_w);
 
 	/* Connect the cancel_button to destroy the widget */
-	g_signal_connect_swapped(
-	    G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_browse_w)->cancel_button),
-	    "clicked", G_CALLBACK(gtk_widget_destroy), G_OBJECT(font_browse_w));
-#endif
+	SIGNAL_CONNECT_OBJECT(
+            GTK_FONT_SELECTION_DIALOG(font_browse_w)->cancel_button, "clicked",
+            gtk_widget_destroy, font_browse_w);
 
 	/* Catch the "key_press_event" signal in the window, so that we can
 	   catch the ESC key being pressed and act as if the "Cancel" button
@@ -454,12 +410,11 @@ font_browse_destroy(GtkWidget *win, gpointer data _U_)
 	/* Get the widget that requested that we be popped up, if any.
 	   (It should arrange to destroy us if it's destroyed, so
 	   that we don't get a pointer to a non-existent window here.) */
-	caller = gtk_object_get_data(GTK_OBJECT(win), FONT_CALLER_PTR_KEY);
+	caller = OBJECT_GET_DATA(win, FONT_CALLER_PTR_KEY);
 
 	if (caller != NULL) {
 		/* Tell it we no longer exist. */
-		gtk_object_set_data(GTK_OBJECT(caller), FONT_DIALOG_PTR_KEY,
-		    NULL);
+		OBJECT_SET_DATA(caller, FONT_DIALOG_PTR_KEY, NULL);
 	}
 
 	/* Now nuke this window. */
@@ -477,35 +432,29 @@ void
 gui_prefs_fetch(GtkWidget *w)
 {
 	prefs.gui_scrollbar_on_right = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), SCROLLBAR_PLACEMENT_KEY),
-	    scrollbar_placement_vals);
+	    OBJECT_GET_DATA(w, SCROLLBAR_PLACEMENT_KEY),
+            scrollbar_placement_vals);
 	prefs.gui_plist_sel_browse = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), PLIST_SEL_BROWSE_KEY),
-	    selection_mode_vals);
+	    OBJECT_GET_DATA(w, PLIST_SEL_BROWSE_KEY), selection_mode_vals);
 	prefs.gui_ptree_sel_browse = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), PTREE_SEL_BROWSE_KEY),
-	    selection_mode_vals);
+	    OBJECT_GET_DATA(w, PTREE_SEL_BROWSE_KEY), selection_mode_vals);
 #if GTK_MAJOR_VERSION < 2
 	prefs.gui_ptree_line_style = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), PTREE_LINE_STYLE_KEY),
-	    line_style_vals);
+	    OBJECT_GET_DATA(w, PTREE_LINE_STYLE_KEY), line_style_vals);
 	prefs.gui_ptree_expander_style = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), PTREE_EXPANDER_STYLE_KEY),
-	    expander_style_vals);
+	    OBJECT_GET_DATA(w, PTREE_EXPANDER_STYLE_KEY), expander_style_vals);
 #else
         prefs.gui_altern_colors = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), ALTERN_COLORS_KEY),
-	    altern_colors_vals);
+	    OBJECT_GET_DATA(w, ALTERN_COLORS_KEY), altern_colors_vals);
 #endif
 	prefs.gui_hex_dump_highlight_style = fetch_enum_value(
-	    gtk_object_get_data(GTK_OBJECT(w), HEX_DUMP_HIGHLIGHT_STYLE_KEY),
-	    highlight_style_vals);
+	    OBJECT_GET_DATA(w, HEX_DUMP_HIGHLIGHT_STYLE_KEY),
+            highlight_style_vals);
 	prefs.gui_geometry_save_position =
-	    gtk_toggle_button_get_active(gtk_object_get_data(GTK_OBJECT(w),
+	    gtk_toggle_button_get_active(OBJECT_GET_DATA(w,
 	    	GEOMETRY_POSITION_KEY));
 	prefs.gui_geometry_save_size =
-	    gtk_toggle_button_get_active(gtk_object_get_data(GTK_OBJECT(w),
-	    	GEOMETRY_SIZE_KEY));
+	    gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GEOMETRY_SIZE_KEY));
 
 	if (font_changed) {
 		if (prefs.gui_font_name != NULL)
@@ -593,7 +542,7 @@ gui_prefs_destroy(GtkWidget *w)
 
 	/* Is there a font selection dialog associated with this
 	   Preferences dialog? */
-	fs = gtk_object_get_data(GTK_OBJECT(caller), FONT_DIALOG_PTR_KEY);
+	fs = OBJECT_GET_DATA(caller, FONT_DIALOG_PTR_KEY);
 
 	if (fs != NULL) {
 		/* Yes.  Destroy it. */
@@ -602,7 +551,7 @@ gui_prefs_destroy(GtkWidget *w)
 
 	/* Is there a color selection dialog associated with this
 	   Preferences dialog? */
-	fs = gtk_object_get_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY);
+	fs = OBJECT_GET_DATA(caller, COLOR_DIALOG_PTR_KEY);
 
 	if (fs != NULL) {
 		/* Yes.  Destroy it. */
@@ -659,8 +608,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
 
   /* Has a color dialog box already been opened for that top-level
      widget? */
-  color_w = gtk_object_get_data(GTK_OBJECT(caller),
-				COLOR_DIALOG_PTR_KEY);
+  color_w = OBJECT_GET_DATA(caller, COLOR_DIALOG_PTR_KEY);
 
   if (color_w != NULL) {
     /* Yes.  Just re-activate that dialog box. */
@@ -685,23 +633,11 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
      into it. */
   color_w = dlg_window_new("Ethereal: Select Color");
 
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(color_w), "delete_event",
-    GTK_SIGNAL_FUNC(color_delete_cb), NULL);
-
-  /* Call a handler when we're destroyed, so we can inform our caller,
-     if any, that we've been destroyed. */
-  gtk_signal_connect(GTK_OBJECT(color_w), "destroy",
-		     GTK_SIGNAL_FUNC(color_destroy_cb), NULL);
-#else
-  g_signal_connect(G_OBJECT(color_w), "delete_event",
-                   G_CALLBACK(color_delete_cb), NULL);
+  SIGNAL_CONNECT(color_w, "delete_event", color_delete_cb, NULL);
 
   /* Call a handler when we're destroyed, so we can inform our caller,
      if any, that we've been destroyed. */
-  g_signal_connect(G_OBJECT(color_w), "destroy",
-                   G_CALLBACK(color_destroy_cb), NULL);
-#endif
+  SIGNAL_CONNECT(color_w, "destroy", color_destroy_cb, NULL);
 
   main_vb = gtk_vbox_new(FALSE, 5);
   gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
@@ -721,17 +657,9 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
   menu = gtk_menu_new();
   for (i = 0; i < MAX_HANDLED_COL; i++){
     menuitem = gtk_menu_item_new_with_label(color_info[i].label);
-    gtk_object_set_data(GTK_OBJECT(menuitem), COLOR_SELECTION_PTR_KEY,
-			(gpointer) colorsel);
-#if GTK_MAJOR_VERSION < 2
-    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-		       GTK_SIGNAL_FUNC(update_current_color),
-		       &color_info[i].color);
-#else
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(update_current_color),
-		       &color_info[i].color);
-#endif
+    OBJECT_SET_DATA(menuitem, COLOR_SELECTION_PTR_KEY, colorsel);
+    SIGNAL_CONNECT(menuitem, "activate", update_current_color,
+                   &color_info[i].color);
     gtk_widget_show(menuitem);
     gtk_menu_append(GTK_MENU (menu), menuitem);
   }
@@ -743,7 +671,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
   sample = gtk_text_new(FALSE, FALSE);
   height = sample->style->font->ascent + sample->style->font->descent;
   width = gdk_string_width(sample->style->font, SAMPLE_MARKED_TEXT);
-  gtk_widget_set_usize(GTK_WIDGET(sample), width, height);
+  WIDGET_SET_SIZE(GTK_WIDGET(sample), width, height);
   gtk_text_set_editable(GTK_TEXT(sample), FALSE);
   gtk_text_insert(GTK_TEXT(sample), NULL,
 		  &color_info[MFG_IDX].color,
@@ -766,23 +694,17 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
 #if GTK_MAJOR_VERSION < 2
   gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel),
 				&scolor[CS_RED]);
-  gtk_object_set_data(GTK_OBJECT(colorsel), COLOR_SAMPLE_PTR_KEY,
-		      (gpointer) sample);
-  gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
-		     GTK_SIGNAL_FUNC(update_text_color), NULL);
 #else
   gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel),
                                         curcolor);
-  g_object_set_data(G_OBJECT(colorsel), COLOR_SAMPLE_PTR_KEY,
-                    (gpointer) sample);
-  g_signal_connect(G_OBJECT(colorsel), "color-changed",
-                   G_CALLBACK(update_text_color), NULL);
 #endif
+  OBJECT_SET_DATA(colorsel, COLOR_SAMPLE_PTR_KEY, sample);
+  SIGNAL_CONNECT(colorsel, "color-changed", update_text_color, NULL);
   gtk_widget_show(colorsel);
   gtk_widget_show(main_vb);
 
-  gtk_object_set_data(GTK_OBJECT(color_w), COLOR_CALLER_PTR_KEY, caller);
-  gtk_object_set_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY, color_w);
+  OBJECT_SET_DATA(color_w, COLOR_CALLER_PTR_KEY, caller);
+  OBJECT_SET_DATA(caller, COLOR_DIALOG_PTR_KEY, color_w);
 
   /* Ok, Cancel Buttons */
   bbox = gtk_hbutton_box_new();
@@ -793,27 +715,20 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
 
 #if GTK_MAJOR_VERSION < 2
   ok_bt = gtk_button_new_with_label ("OK");
-  gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-		     GTK_SIGNAL_FUNC(color_ok_cb), color_w);
 #else
   ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_signal_connect(G_OBJECT(ok_bt), "clicked",
-		   G_CALLBACK(color_ok_cb), color_w);
 #endif
+  SIGNAL_CONNECT(ok_bt, "clicked", color_ok_cb, color_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 #if GTK_MAJOR_VERSION < 2
   cancel_bt = gtk_button_new_with_label ("Cancel");
-  gtk_signal_connect_object(GTK_OBJECT(cancel_bt), "clicked",
-			    (GtkSignalFunc)gtk_widget_destroy,
-			    GTK_OBJECT(color_w));
 #else
   cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  g_signal_connect_swapped(G_OBJECT(cancel_bt), "clicked",
-                           G_CALLBACK(gtk_widget_destroy), G_OBJECT(color_w));
 #endif
+  SIGNAL_CONNECT_OBJECT(cancel_bt, "clicked", gtk_widget_destroy, color_w);
   gtk_box_pack_start(GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
   gtk_widget_show(cancel_bt);
   dlg_set_cancel(color_w, cancel_bt);
@@ -823,8 +738,7 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
 
 static void
 update_text_color(GtkWidget *w, gpointer data _U_) {
-  GtkWidget     *sample = gtk_object_get_data(GTK_OBJECT(w),
-                                              COLOR_SAMPLE_PTR_KEY);
+  GtkWidget     *sample = OBJECT_GET_DATA(w, COLOR_SAMPLE_PTR_KEY);
 #if GTK_MAJOR_VERSION < 2
   gdouble        scolor[4];
 
@@ -865,8 +779,7 @@ update_current_color(GtkWidget *w, gpointer data)
 #if GTK_MAJOR_VERSION < 2
   gdouble            scolor[4];
 
-  colorsel = GTK_COLOR_SELECTION(gtk_object_get_data(GTK_OBJECT(w),
-						     COLOR_SELECTION_PTR_KEY));
+  colorsel = GTK_COLOR_SELECTION(OBJECT_GET_DATA(w, COLOR_SELECTION_PTR_KEY));
   curcolor = (GdkColor *)data;
   scolor[CS_RED]     = (gdouble) (curcolor->red)   / 65535.0;
   scolor[CS_GREEN]   = (gdouble) (curcolor->green) / 65535.0;
@@ -916,10 +829,9 @@ color_delete_cb(GtkWidget *prefs_w _U_, gpointer dummy _U_)
 static void
 color_destroy_cb(GtkWidget *w, gpointer data _U_)
 {
-  GtkWidget *caller = gtk_object_get_data(GTK_OBJECT(w),
-					  COLOR_CALLER_PTR_KEY);
+  GtkWidget *caller = OBJECT_GET_DATA(w, COLOR_CALLER_PTR_KEY);
   if (caller != NULL) {
-    gtk_object_set_data(GTK_OBJECT(caller), COLOR_DIALOG_PTR_KEY, NULL);
+    OBJECT_SET_DATA(caller, COLOR_DIALOG_PTR_KEY, NULL);
   }
   gtk_grab_remove(GTK_WIDGET(w));
   gtk_widget_destroy(GTK_WIDGET(w));
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 9f58d99dbb..6ba0366a4a 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
 /* help_dlg.c
  *
- * $Id: help_dlg.c,v 1.27 2002/11/03 17:38:33 oabad Exp $
+ * $Id: help_dlg.c,v 1.28 2002/11/11 15:39:05 oabad Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
@@ -41,6 +41,7 @@
 #include "main.h"
 #include "ui_util.h"
 #include <epan/proto.h>
+#include "compat_macros.h"
 
 typedef enum {
   OVERVIEW_HELP,
@@ -93,20 +94,9 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
 #endif
   gtk_widget_set_name(help_w, "Ethereal Help window" );
   gtk_window_set_title(GTK_WINDOW(help_w), "Ethereal: Help");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(help_w), "destroy",
-		     GTK_SIGNAL_FUNC(help_destroy_cb), NULL);
-  gtk_signal_connect(GTK_OBJECT (help_w), "realize",
-		     GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL);
-  gtk_widget_set_usize(GTK_WIDGET(help_w), DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3);
-#else
-  g_signal_connect(G_OBJECT(help_w), "destroy",
-                   G_CALLBACK(help_destroy_cb), NULL);
-  g_signal_connect(G_OBJECT(help_w), "realize",
-                   G_CALLBACK(window_icon_realize_cb), NULL);
-  gtk_widget_set_size_request(GTK_WIDGET(help_w), DEF_WIDTH * 2/3,
-                              DEF_HEIGHT * 2/3);
-#endif
+  SIGNAL_CONNECT(help_w, "destroy", help_destroy_cb, NULL);
+  SIGNAL_CONNECT(help_w, "realize", window_icon_realize_cb, NULL);
+  WIDGET_SET_SIZE(help_w, DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3);
   gtk_container_border_width(GTK_CONTAINER(help_w), 2);
 
   /* Container for each row of widgets */
@@ -298,13 +288,10 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
   gtk_widget_show(bbox);
 #if GTK_MAJOR_VERSION < 2
   close_bt = gtk_button_new_with_label("Close");
-  gtk_signal_connect(GTK_OBJECT(close_bt), "clicked",
-		     GTK_SIGNAL_FUNC(help_close_cb), GTK_OBJECT(help_w));
 #else
   close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-  g_signal_connect(G_OBJECT(close_bt), "clicked",
-                   G_CALLBACK(help_close_cb), G_OBJECT(help_w));
 #endif
+  SIGNAL_CONNECT(close_bt, "clicked", help_close_cb, help_w);
   GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
   gtk_container_add(GTK_CONTAINER(bbox), close_bt);
   gtk_widget_grab_default(close_bt);
@@ -457,7 +444,7 @@ static void set_help_text(GtkWidget *w, help_type_t type)
 
 #if GTK_MAJOR_VERSION < 2
     height = (2 + nb_lines) * m_font_height;
-    gtk_widget_set_usize(GTK_WIDGET(w), 20 + width, 20 + height);
+    WIDGET_SET_SIZE(w, 20 + width, 20 + height);
 #endif
     break;
 
@@ -518,7 +505,7 @@ static void set_help_text(GtkWidget *w, help_type_t type)
     }
 #if GTK_MAJOR_VERSION < 2
     height = (1 + nb_lines) * m_font_height;
-    gtk_widget_set_usize(GTK_WIDGET(w), 20 + width, 20 + height);
+    WIDGET_SET_SIZE(w, 20 + width, 20 + height);
 #endif
     break;
   case CFILTER_HELP :
diff --git a/gtk/menu.c b/gtk/menu.c
index f853aed8e5..6ceeb21623 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.72 2002/11/11 12:37:15 oabad Exp $
+ * $Id: menu.c,v 1.73 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -61,6 +61,7 @@
 #include "rpc_progs.h"
 #include "../packet-dcerpc.h"
 #include "dcerpc_stat.h"
+#include "compat_macros.h"
 
 GtkWidget *popup_menu_object;
 
@@ -452,17 +453,20 @@ menus_init(void) {
 
     packet_list_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
     gtk_item_factory_create_items_ac(packet_list_menu_factory, sizeof(packet_list_menu_items)/sizeof(packet_list_menu_items[0]), packet_list_menu_items, popup_menu_object, 2);
-    gtk_object_set_data(GTK_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY, packet_list_menu_factory->widget);
+    OBJECT_SET_DATA(popup_menu_object, PM_PACKET_LIST_KEY,
+                    packet_list_menu_factory->widget);
     popup_menu_list = g_slist_append((GSList *)popup_menu_list, packet_list_menu_factory);
 
     tree_view_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
     gtk_item_factory_create_items_ac(tree_view_menu_factory, sizeof(tree_view_menu_items)/sizeof(tree_view_menu_items[0]), tree_view_menu_items, popup_menu_object, 2);
-    gtk_object_set_data(GTK_OBJECT(popup_menu_object), PM_TREE_VIEW_KEY, tree_view_menu_factory->widget);
+    OBJECT_SET_DATA(popup_menu_object, PM_TREE_VIEW_KEY,
+                    tree_view_menu_factory->widget);
     popup_menu_list = g_slist_append((GSList *)popup_menu_list, tree_view_menu_factory);
 
     hexdump_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
     gtk_item_factory_create_items_ac(hexdump_menu_factory, sizeof(hexdump_menu_items)/sizeof(hexdump_menu_items[0]), hexdump_menu_items, popup_menu_object, 2);
-    gtk_object_set_data(GTK_OBJECT(popup_menu_object), PM_HEXDUMP_KEY, hexdump_menu_factory->widget);
+    OBJECT_SET_DATA(popup_menu_object, PM_HEXDUMP_KEY,
+                    hexdump_menu_factory->widget);
     popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory);
 
     factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp);
@@ -533,7 +537,7 @@ set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpo
 	GtkWidget *menu = NULL;
 
 	if ((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL)
-		gtk_object_set_data(GTK_OBJECT(menu), key, data);
+		OBJECT_SET_DATA(menu, key, data);
 }
 
 void
@@ -568,16 +572,15 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
 	 * as a pixmap.
 	 */
 	/* Check if we are on packet_list object */
-	if (widget == gtk_object_get_data(GTK_OBJECT(popup_menu_object),
-		E_MPACKET_LIST_KEY)) {
+	if (widget == OBJECT_GET_DATA(popup_menu_object, E_MPACKET_LIST_KEY)) {
 	  packet_list=GTK_CLIST(widget);
 	  if (gtk_clist_get_selection_info(GTK_CLIST(packet_list),
 	      ((GdkEventButton *)event)->x,
 	      ((GdkEventButton *)event)->y,&row,&column)) {
-	    gtk_object_set_data(GTK_OBJECT(popup_menu_object),
-		E_MPACKET_LIST_ROW_KEY, (gpointer *)row);
-	    gtk_object_set_data(GTK_OBJECT(popup_menu_object),
-		E_MPACKET_LIST_COL_KEY, (gpointer *)column);
+	    OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_ROW_KEY,
+                            GINT_TO_POINTER(row));
+	    OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_COL_KEY,
+                            GINT_TO_POINTER(column));
 	  }
 	}
 	menu = (GtkWidget *)data;
@@ -585,8 +588,10 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
 		event_button = (GdkEventButton *) event;
 
 		if(event_button->button == 3) {
-			gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event_button->button, event_button->time);
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
+			gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+                                       event_button->button,
+                                       event_button->time);
+			SIGNAL_EMIT_STOP_BY_NAME(widget, "button_press_event");
 			return TRUE;
 		}
 	}
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 41f6b8c939..a28952b402 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -1,7 +1,7 @@
 /* packet_list.c
  * packet list related functions   2002 Olivier Abad
  *
- * $Id: packet_list.c,v 1.3 2002/11/03 17:38:34 oabad Exp $
+ * $Id: packet_list.c,v 1.4 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,6 +35,7 @@
 #include "color_utils.h"
 #include "column.h"
 #include "epan/column_info.h"
+#include "compat_macros.h"
 
 void
 packet_list_clear(void)
@@ -57,7 +58,7 @@ packet_list_thaw(void)
 void
 packet_list_select_row(gint row)
 {
-    gtk_signal_emit_by_name(GTK_OBJECT(packet_list), "select_row", row);
+    SIGNAL_EMIT_BY_NAME1(packet_list, "select_row", row);
 }
 
 void
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index d5035baec4..6a4f3f822a 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet_win.c,v 1.41 2002/11/03 17:38:34 oabad Exp $
+ * $Id: packet_win.c,v 1.42 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -58,6 +58,7 @@
 #include "gtkglobals.h"
 #include <epan/plugins.h>
 #include <epan/epan_dissect.h>
+#include "compat_macros.h"
 
 /* Data structure holding information about a packet-detail window. */
 struct PacketWinData {
@@ -157,22 +158,18 @@ void new_window_cb(GtkWidget *w _U_)
 
   /* load callback handlers */
 #if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(tree_view), "tree-select-row",
-                     GTK_SIGNAL_FUNC(new_tree_view_select_row_cb), DataPtr);
+  SIGNAL_CONNECT(tree_view, "tree-select-row", new_tree_view_select_row_cb,
+                 DataPtr);
 
-  gtk_signal_connect(GTK_OBJECT(tree_view), "tree-unselect-row",
-                     GTK_SIGNAL_FUNC(new_tree_view_unselect_row_cb), DataPtr);
-
-  gtk_signal_connect(GTK_OBJECT(main_w), "destroy",
-                     GTK_SIGNAL_FUNC(destroy_new_window), DataPtr);
+  SIGNAL_CONNECT(tree_view, "tree-unselect-row", new_tree_view_unselect_row_cb,
+                 DataPtr);
 #else
-  g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view))),
-                   "changed", G_CALLBACK(new_tree_view_selection_changed_cb),
-                   DataPtr);
-  g_signal_connect(G_OBJECT(main_w), "destroy",
-                   G_CALLBACK(destroy_new_window), DataPtr);
+  SIGNAL_CONNECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)),
+                 "changed", new_tree_view_selection_changed_cb, DataPtr);
 #endif
 
+  SIGNAL_CONNECT(main_w, "destroy", destroy_new_window, DataPtr);
+
   /* draw the protocol tree & print hex data */
   add_byte_views(DataPtr->edt, tree_view, DataPtr->bv_nb_ptr);
   proto_tree_draw(DataPtr->edt->tree, tree_view);
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index f6f170f36b..0a58159165 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,7 +1,7 @@
 /* plugins_dlg.c
  * Dialog boxes for plugins
  *
- * $Id: plugins_dlg.c,v 1.27 2002/11/03 17:38:34 oabad Exp $
+ * $Id: plugins_dlg.c,v 1.28 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -34,6 +34,7 @@
 #if GTK_MAJOR_VERSION >= 2
 #include "ui_util.h"
 #endif
+#include "compat_macros.h"
 
 #ifdef HAVE_PLUGINS
 
@@ -42,13 +43,6 @@ static void plugins_close_cb(GtkWidget *, gpointer);
 static void plugins_scan(GtkWidget *);
 #else
 static void plugins_scan(GtkListStore *);
-
-enum
-{
-    COLUMN_NAME,
-    COLUMN_VERSION,
-    NUM_COLUMNS
-};
 #endif
 
 void
@@ -63,9 +57,8 @@ tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
     GtkWidget *frame_vbnbox;
     GtkWidget *main_hbnbox;
     GtkWidget *close_bn;
-#if GTK_MAJOR_VERSION < 2
     gchar     *titles[] = {"Name", "Version"};
-#else
+#if GTK_MAJOR_VERSION >= 2
     GtkListStore *store;
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column;
@@ -89,11 +82,7 @@ tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
     scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
     gtk_box_pack_start(GTK_BOX(frame_hbox), scrolledwindow, TRUE, TRUE, 0);
-#if GTK_MAJOR_VERSION < 2
-    gtk_widget_set_usize(scrolledwindow, 400, 150);
-#else
-    gtk_widget_set_size_request(scrolledwindow, 400, 150);
-#endif
+    WIDGET_SET_SIZE(scrolledwindow, 400, 150);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     gtk_widget_show(scrolledwindow);
@@ -108,22 +97,21 @@ tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
     gtk_clist_set_column_auto_resize(GTK_CLIST(plugins_list), 1, TRUE);
     plugins_scan(plugins_list);
 #else
-    store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
+    store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
     plugins_scan(store);
     plugins_list = tree_view_new(GTK_TREE_MODEL(store));
     gtk_tree_view_set_search_column(GTK_TREE_VIEW(plugins_list), 0);
     g_object_unref(G_OBJECT(store));
     gtk_container_add(GTK_CONTAINER(scrolledwindow), plugins_list);
     renderer = gtk_cell_renderer_text_new();
-    column = gtk_tree_view_column_new_with_attributes("Name", renderer, "text",
-                                                      COLUMN_NAME, NULL);
-    gtk_tree_view_column_set_sort_column_id(column, COLUMN_NAME);
+    column = gtk_tree_view_column_new_with_attributes(titles[0], renderer,
+                                                      "text", 0, NULL);
+    gtk_tree_view_column_set_sort_column_id(column, 0);
     gtk_tree_view_append_column(GTK_TREE_VIEW(plugins_list), column);
     renderer = gtk_cell_renderer_text_new();
-    column = gtk_tree_view_column_new_with_attributes("Version", renderer,
-                                                      "text", COLUMN_VERSION,
-                                                      NULL);
-    gtk_tree_view_column_set_sort_column_id(column, COLUMN_VERSION);
+    column = gtk_tree_view_column_new_with_attributes(titles[1], renderer,
+                                                      "text", 1, NULL);
+    gtk_tree_view_column_set_sort_column_id(column, 1);
     gtk_tree_view_append_column(GTK_TREE_VIEW(plugins_list), column);
 #endif
     gtk_widget_show(plugins_list);
@@ -149,14 +137,7 @@ tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 #endif
     gtk_container_add(GTK_CONTAINER(main_hbnbox), close_bn);
     gtk_widget_show(close_bn);
-#if GTK_MAJOR_VERSION < 2
-    gtk_signal_connect(GTK_OBJECT(close_bn), "clicked",
-                       GTK_SIGNAL_FUNC(plugins_close_cb),
-                       GTK_OBJECT(plugins_window));
-#else
-    g_signal_connect(G_OBJECT(close_bn), "clicked",
-                     G_CALLBACK(plugins_close_cb), G_OBJECT(plugins_window));
-#endif
+    SIGNAL_CONNECT(close_bn, "clicked", plugins_close_cb, plugins_window);
 
     gtk_widget_show(plugins_window);
 
@@ -189,8 +170,8 @@ plugins_scan(GtkListStore *store)
 	gtk_clist_append(GTK_CLIST(list), plugent);
 #else
         gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, COLUMN_NAME, pt_plug->name,
-                           COLUMN_VERSION, pt_plug->version, -1);
+        gtk_list_store_set(store, &iter, 0, pt_plug->name, 1, pt_plug->version,
+                           -1);
 #endif
 	pt_plug = pt_plug->next;
     }
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 2c65f955bc..ca37320d12 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.54 2002/11/03 17:38:34 oabad Exp $
+ * $Id: prefs_dlg.c,v 1.55 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -47,6 +47,7 @@
 #include "ui_util.h"
 #include "dlg_utils.h"
 #include "simple_dialog.h"
+#include "compat_macros.h"
 
 #include "prefs-int.h"
 
@@ -226,7 +227,7 @@ module_prefs_show(module_t *module, gpointer user_data)
   gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
   gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
   gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
-  gtk_object_set_data(GTK_OBJECT(main_tb), E_TOOLTIPS_KEY, cts->tooltips);
+  OBJECT_SET_DATA(main_tb, E_TOOLTIPS_KEY, cts->tooltips);
 
   /* Add items for each of the preferences */
   prefs_pref_foreach(module, pref_show, main_tb);
@@ -284,17 +285,8 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   copy_prefs(&saved_prefs, &prefs);
 
   prefs_w = dlg_window_new("Ethereal: Preferences");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(prefs_w), "delete_event",
-                     GTK_SIGNAL_FUNC(prefs_main_delete_cb), NULL);
-  gtk_signal_connect(GTK_OBJECT(prefs_w), "destroy",
-                     GTK_SIGNAL_FUNC(prefs_main_destroy_cb), NULL);
-#else
-  g_signal_connect(G_OBJECT(prefs_w), "delete_event",
-                   G_CALLBACK(prefs_main_delete_cb), NULL);
-  g_signal_connect(G_OBJECT(prefs_w), "destroy",
-                   G_CALLBACK(prefs_main_destroy_cb), NULL);
-#endif
+  SIGNAL_CONNECT(prefs_w, "delete_event", prefs_main_delete_cb, NULL);
+  SIGNAL_CONNECT(prefs_w, "destroy", prefs_main_destroy_cb, NULL);
 
   /*
    * Unfortunately, we can't arrange that a GtkTable widget wrap an event box
@@ -344,11 +336,9 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
 
 #if GTK_MAJOR_VERSION < 2
   gtk_clist_set_column_auto_resize(GTK_CLIST(cts.tree), 0, TRUE);
-  gtk_signal_connect(GTK_OBJECT(cts.tree), "tree-select-row",
-                     GTK_SIGNAL_FUNC(prefs_tree_select_cb), NULL);
+  SIGNAL_CONNECT(cts.tree, "tree-select-row", prefs_tree_select_cb, NULL);
 #else
-  g_signal_connect(G_OBJECT(selection), "changed",
-                   G_CALLBACK(prefs_tree_select_cb), NULL);
+  SIGNAL_CONNECT(selection, "changed", prefs_tree_select_cb, NULL);
 #endif
   gtk_widget_show(cts.tree);
 
@@ -364,7 +354,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_widget_show(GTK_WIDGET(frame));
   print_pg = printer_prefs_show();
   gtk_container_add(GTK_CONTAINER(frame), print_pg);
-  gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg);
+  OBJECT_SET_DATA(prefs_w, E_PRINT_PAGE_KEY, print_pg);
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
   strcpy(label_str, "Printing");
 #if GTK_MAJOR_VERSION < 2
@@ -383,7 +373,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_widget_show(GTK_WIDGET(frame));
   column_pg = column_prefs_show();
   gtk_container_add(GTK_CONTAINER(frame), column_pg);
-  gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
+  OBJECT_SET_DATA(prefs_w, E_COLUMN_PAGE_KEY, column_pg);
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
   strcpy(label_str, "Columns");
 #if GTK_MAJOR_VERSION < 2
@@ -402,7 +392,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_widget_show(GTK_WIDGET(frame));
   stream_pg = stream_prefs_show();
   gtk_container_add(GTK_CONTAINER(frame), stream_pg);
-  gtk_object_set_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY, stream_pg);
+  OBJECT_SET_DATA(prefs_w, E_STREAM_PAGE_KEY, stream_pg);
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
   strcpy(label_str, "TCP Streams");
 #if GTK_MAJOR_VERSION < 2
@@ -421,7 +411,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_widget_show(GTK_WIDGET(frame));
   gui_pg = gui_prefs_show();
   gtk_container_add(GTK_CONTAINER(frame), gui_pg);
-  gtk_object_set_data(GTK_OBJECT(prefs_w), E_GUI_PAGE_KEY, gui_pg);
+  OBJECT_SET_DATA(prefs_w, E_GUI_PAGE_KEY, gui_pg);
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
   strcpy(label_str, "User Interface");
 #if GTK_MAJOR_VERSION < 2
@@ -445,7 +435,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_widget_show(GTK_WIDGET(frame));
   capture_pg = capture_prefs_show();
   gtk_container_add(GTK_CONTAINER(frame), capture_pg);
-  gtk_object_set_data(GTK_OBJECT(prefs_w), E_CAPTURE_PAGE_KEY, capture_pg);
+  OBJECT_SET_DATA(prefs_w, E_CAPTURE_PAGE_KEY, capture_pg);
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
   strcpy(label_str, "Capture");
 #if GTK_MAJOR_VERSION < 2
@@ -468,7 +458,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_widget_show(GTK_WIDGET(frame));
   nameres_pg = nameres_prefs_show();
   gtk_container_add(GTK_CONTAINER(frame), nameres_pg);
-  gtk_object_set_data(GTK_OBJECT(prefs_w), E_NAMERES_PAGE_KEY, nameres_pg);
+  OBJECT_SET_DATA(prefs_w, E_NAMERES_PAGE_KEY, nameres_pg);
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
   strcpy(label_str, "Name resolution");
 #if GTK_MAJOR_VERSION < 2
@@ -508,13 +498,10 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
 
 #if GTK_MAJOR_VERSION < 2
   ok_bt = gtk_button_new_with_label ("OK");
-  gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-                     GTK_SIGNAL_FUNC(prefs_main_ok_cb), GTK_OBJECT(prefs_w));
 #else
   ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_signal_connect(G_OBJECT(ok_bt), "clicked",
-                   G_CALLBACK(prefs_main_ok_cb), G_OBJECT(prefs_w));
 #endif
+  SIGNAL_CONNECT(ok_bt, "clicked", prefs_main_ok_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
@@ -522,40 +509,30 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
 
 #if GTK_MAJOR_VERSION < 2
   apply_bt = gtk_button_new_with_label ("Apply");
-  gtk_signal_connect(GTK_OBJECT(apply_bt), "clicked",
-                     GTK_SIGNAL_FUNC(prefs_main_apply_cb), GTK_OBJECT(prefs_w));
 #else
   apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-  g_signal_connect(G_OBJECT(apply_bt), "clicked",
-                   G_CALLBACK(prefs_main_apply_cb), G_OBJECT(prefs_w));
 #endif
+  SIGNAL_CONNECT(apply_bt, "clicked", prefs_main_apply_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), apply_bt, TRUE, TRUE, 0);
   gtk_widget_show(apply_bt);
 
 #if GTK_MAJOR_VERSION < 2
   save_bt = gtk_button_new_with_label ("Save");
-  gtk_signal_connect(GTK_OBJECT(save_bt), "clicked",
-                     GTK_SIGNAL_FUNC(prefs_main_save_cb), GTK_OBJECT(prefs_w));
 #else
   save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-  g_signal_connect(G_OBJECT(save_bt), "clicked",
-                   G_CALLBACK(prefs_main_save_cb), G_OBJECT(prefs_w));
 #endif
+  SIGNAL_CONNECT(save_bt, "clicked", prefs_main_save_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0);
   gtk_widget_show(save_bt);
 
 #if GTK_MAJOR_VERSION < 2
   cancel_bt = gtk_button_new_with_label ("Cancel");
-  gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
-                     GTK_SIGNAL_FUNC(prefs_main_cancel_cb),
-                     GTK_OBJECT(prefs_w));
 #else
   cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  g_signal_connect(G_OBJECT(cancel_bt), "clicked",
-                   G_CALLBACK(prefs_main_cancel_cb), G_OBJECT(prefs_w));
 #endif
+  SIGNAL_CONNECT(cancel_bt, "clicked", prefs_main_cancel_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
   gtk_widget_show(cancel_bt);
@@ -599,7 +576,7 @@ create_preference_check_button(GtkWidget *main_tb, int table_position,
 	GtkTooltips *tooltips;
 	GtkWidget *check_box;
 
-	tooltips = gtk_object_get_data(GTK_OBJECT(main_tb), E_TOOLTIPS_KEY);
+	tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
 
 	set_option_label(main_tb, table_position, label_text, tooltip_text,
 	    tooltips);
@@ -626,7 +603,7 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position,
 	const enum_val_t *enum_valp;
 	GtkWidget *event_box;
 
-	tooltips = gtk_object_get_data(GTK_OBJECT(main_tb), E_TOOLTIPS_KEY);
+	tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
 
 	set_option_label(main_tb, table_position, label_text, tooltip_text,
 	    tooltips);
@@ -713,7 +690,7 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position,
 	const enum_val_t *enum_valp;
 	GtkWidget *event_box;
 
-	tooltips = gtk_object_get_data(GTK_OBJECT(main_tb), E_TOOLTIPS_KEY);
+	tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
 
 	set_option_label(main_tb, table_position, label_text, tooltip_text,
 	    tooltips);
@@ -779,7 +756,7 @@ create_preference_entry(GtkWidget *main_tb, int table_position,
 	GtkTooltips *tooltips;
 	GtkWidget *entry;
 
-	tooltips = gtk_object_get_data(GTK_OBJECT(main_tb), E_TOOLTIPS_KEY);
+	tooltips = OBJECT_GET_DATA(main_tb, E_TOOLTIPS_KEY);
 
 	set_option_label(main_tb, table_position, label_text, tooltip_text,
 	    tooltips);
@@ -922,50 +899,39 @@ prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
   /* Fetch the preferences (i.e., make sure all the values set in all of
      the preferences panes have been copied to "prefs" and the registered
      preferences). */
-  printer_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                      E_GUI_PAGE_KEY));
+  printer_prefs_fetch(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_fetch(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_fetch(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_fetch(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_CAPTURE_PAGE_KEY));
+  capture_prefs_fetch(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  nameres_prefs_fetch(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_module_foreach(module_prefs_fetch, &must_redissect);
 
   /* Now apply those preferences. */
-  printer_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w), E_GUI_PAGE_KEY));
+  printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_CAPTURE_PAGE_KEY));
+  capture_prefs_apply(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_apply_all();
 
   /* Now destroy the "Preferences" dialog. */
@@ -985,49 +951,39 @@ prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
   /* Fetch the preferences (i.e., make sure all the values set in all of
      the preferences panes have been copied to "prefs" and the registered
      preferences). */
-  printer_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w), E_GUI_PAGE_KEY));
+  printer_prefs_fetch(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_fetch(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_fetch(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_fetch(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_CAPTURE_PAGE_KEY));
+  capture_prefs_fetch(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  nameres_prefs_fetch(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_module_foreach(module_prefs_fetch, &must_redissect);
 
   /* Now apply those preferences. */
-  printer_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w), E_GUI_PAGE_KEY));
+  printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_CAPTURE_PAGE_KEY));
+  capture_prefs_apply(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_apply_all();
 
   if (must_redissect) {
@@ -1047,26 +1003,21 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w)
   /* Fetch the preferences (i.e., make sure all the values set in all of
      the preferences panes have been copied to "prefs" and the registered
      preferences). */
-  printer_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w), E_GUI_PAGE_KEY));
+  printer_prefs_fetch(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_fetch(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_fetch(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_fetch(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_CAPTURE_PAGE_KEY));
+  capture_prefs_fetch(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_fetch(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  nameres_prefs_fetch(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_module_foreach(module_prefs_fetch, &must_redissect);
 
   /* Create the directory that holds personal configuration files, if
@@ -1101,26 +1052,21 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w)
 	   "Apply" after this, we know we have to redissect;
 
 	4) we did apply the protocol preferences, at least, in the past. */
-  printer_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w), E_GUI_PAGE_KEY));
+  printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_CAPTURE_PAGE_KEY));
+  capture_prefs_apply(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_apply_all();
 
   if (must_redissect) {
@@ -1208,15 +1154,11 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
   prefs_module_foreach(module_prefs_revert, &must_redissect);
 
   /* Now apply the reverted-to preferences. */
-  printer_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_PRINT_PAGE_KEY));
-  column_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_COLUMN_PAGE_KEY));
-  stream_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                         E_STREAM_PAGE_KEY));
-  gui_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w), E_GUI_PAGE_KEY));
-  nameres_prefs_apply(gtk_object_get_data(GTK_OBJECT(parent_w),
-                                          E_NAMERES_PAGE_KEY));
+  printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
+  column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
+  gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
+  nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
   prefs_apply_all();
 
   gtk_widget_destroy(GTK_WIDGET(parent_w));
@@ -1242,26 +1184,21 @@ static void
 prefs_main_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
 {
   /* Let the preference tabs clean up anything they've done. */
-  printer_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w),
-                                            E_PRINT_PAGE_KEY));
-  column_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w),
-                                           E_COLUMN_PAGE_KEY));
-  stream_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w),
-                                           E_STREAM_PAGE_KEY));
-  gui_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w), E_GUI_PAGE_KEY));
+  printer_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_PRINT_PAGE_KEY));
+  column_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_COLUMN_PAGE_KEY));
+  stream_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_STREAM_PAGE_KEY));
+  gui_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_GUI_PAGE_KEY));
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (has_wpcap) {
 #endif /* _WIN32 */
-  capture_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w),
-                                            E_CAPTURE_PAGE_KEY));
+  capture_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_CAPTURE_PAGE_KEY));
 #ifdef _WIN32
   }
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
-  nameres_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w),
-                                            E_NAMERES_PAGE_KEY));
+  nameres_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_NAMERES_PAGE_KEY));
 
   /* Free up the saved preferences (both for "prefs" and for registered
      preferences). */
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 7e2f312c4d..65c9422005 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
 /* print_dlg.c
  * Dialog boxes for printing
  *
- * $Id: print_dlg.c,v 1.39 2002/11/03 17:38:34 oabad Exp $
+ * $Id: print_dlg.c,v 1.40 2002/11/11 15:39:05 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,6 +42,7 @@
 #include <io.h>
 #include "print_mswin.h"
 #endif
+#include "compat_macros.h"
 
 
 /* On Win32, a GUI application apparently can't use "popen()" (it
@@ -135,18 +136,14 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   }
 
   print_w = dlg_window_new("Ethereal: Print");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(print_w), "destroy",
-                     GTK_SIGNAL_FUNC(print_destroy_cb), NULL);
+  SIGNAL_CONNECT(print_w, "destroy", print_destroy_cb, NULL);
 
+#if GTK_MAJOR_VERSION < 2
   /* Accelerator group for the accelerators (or, as they're called in
      Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
      Ctrl+<key> is an accelerator). */
   accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(GTK_WINDOW(print_w), accel_group);
-#else
-  g_signal_connect(G_OBJECT(print_w), "destroy",
-                   G_CALLBACK(print_destroy_cb), NULL);
 #endif
 
   /* Enclosing containers for each row of widgets */
@@ -241,13 +238,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 #endif
   if (print_to_file)
     gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(dest_rb), TRUE);
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(dest_rb), "toggled",
-                     GTK_SIGNAL_FUNC(print_cmd_toggle_dest), NULL);
-#else
-  g_signal_connect(G_OBJECT(dest_rb), "toggled",
-                   G_CALLBACK(print_cmd_toggle_dest), NULL);
-#endif
+  SIGNAL_CONNECT(dest_rb, "toggled", print_cmd_toggle_dest, NULL);
   gtk_box_pack_start(GTK_BOX(dest_hb), dest_rb, FALSE, FALSE, 10);
   gtk_widget_show(dest_rb);
 
@@ -256,7 +247,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 #ifndef _WIN32
   cmd_lb = gtk_label_new("Command:");
 
-  gtk_object_set_data(GTK_OBJECT(dest_rb), PRINT_CMD_LB_KEY, cmd_lb);
+  OBJECT_SET_DATA(dest_rb, PRINT_CMD_LB_KEY, cmd_lb);
   gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0, 0.5);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_lb, 0, 1, 2, 3);
   gtk_widget_set_sensitive(cmd_lb, !print_to_file);
@@ -264,7 +255,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
   cmd_te = gtk_entry_new();
 
-  gtk_object_set_data(GTK_OBJECT(dest_rb), PRINT_CMD_TE_KEY, cmd_te);
+  OBJECT_SET_DATA(dest_rb, PRINT_CMD_TE_KEY, cmd_te);
   if (prefs.pr_cmd)
     gtk_entry_set_text(GTK_ENTRY(cmd_te), prefs.pr_cmd);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_te, 1, 2, 2, 3);
@@ -279,27 +270,21 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   gtk_widget_show(file_bt_hb);
 
   file_bt = gtk_button_new_with_label("File:");
-  gtk_object_set_data(GTK_OBJECT(dest_rb), PRINT_FILE_BT_KEY, file_bt);
+  OBJECT_SET_DATA(dest_rb, PRINT_FILE_BT_KEY, file_bt);
   gtk_box_pack_end(GTK_BOX(file_bt_hb), file_bt, FALSE, FALSE, 0);
   gtk_widget_set_sensitive(file_bt, print_to_file);
   gtk_widget_show(file_bt);
 
   file_te = gtk_entry_new();
 
-  gtk_object_set_data(GTK_OBJECT(dest_rb), PRINT_FILE_TE_KEY, file_te);
+  OBJECT_SET_DATA(dest_rb, PRINT_FILE_TE_KEY, file_te);
   gtk_table_attach_defaults(GTK_TABLE(main_tb), file_te, 1, 2, 3, 4);
   gtk_widget_set_sensitive(file_te, print_to_file);
   gtk_widget_show(file_te);
   if (print_to_file)
     gtk_widget_grab_focus(file_te);
 
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(file_bt), "clicked",
-                     GTK_SIGNAL_FUNC(print_file_cb), GTK_OBJECT(file_te));
-#else
-  g_signal_connect(G_OBJECT(file_bt), "clicked",
-                   G_CALLBACK(print_file_cb), GTK_OBJECT(file_te));
-#endif
+  SIGNAL_CONNECT(file_bt, "clicked", print_file_cb, file_te);
 
   /* Horizontal box into which to put two vertical boxes of option
      buttons. */
@@ -338,13 +323,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
                                 GTK_RADIO_BUTTON(button), "Print _detail");
 #endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(detail_rb), TRUE);
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(detail_rb), "toggled",
-                     GTK_SIGNAL_FUNC(print_cmd_toggle_detail), NULL);
-#else
-  g_signal_connect(G_OBJECT(detail_rb), "toggled",
-                   G_CALLBACK(print_cmd_toggle_detail), NULL);
-#endif
+  SIGNAL_CONNECT(detail_rb, "toggled", print_cmd_toggle_detail, NULL);
   gtk_container_add(GTK_CONTAINER(print_type_vb), detail_rb);
   gtk_widget_show(detail_rb);
 
@@ -403,12 +382,9 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   gtk_container_add(GTK_CONTAINER(expand_vb), as_displayed_rb);
   gtk_widget_show(as_displayed_rb);
 
-  gtk_object_set_data(GTK_OBJECT(detail_rb), PRINT_EXPAND_ALL_RB_KEY,
-			expand_all_rb);
-  gtk_object_set_data(GTK_OBJECT(detail_rb), PRINT_AS_DISPLAYED_RB_KEY,
-			as_displayed_rb);
-  gtk_object_set_data(GTK_OBJECT(detail_rb), PRINT_HEX_CB_KEY,
-			hex_cb);
+  OBJECT_SET_DATA(detail_rb, PRINT_EXPAND_ALL_RB_KEY, expand_all_rb);
+  OBJECT_SET_DATA(detail_rb, PRINT_AS_DISPLAYED_RB_KEY, as_displayed_rb);
+  OBJECT_SET_DATA(detail_rb, PRINT_HEX_CB_KEY, hex_cb);
 
   /* Button row: OK and Cancel buttons */
   bbox = gtk_hbutton_box_new();
@@ -419,37 +395,21 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
 #if GTK_MAJOR_VERSION < 2
   ok_bt = gtk_button_new_with_label ("OK");
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_FORMAT_RB_KEY, format_rb);
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_DEST_RB_KEY, dest_rb);
-#ifndef _WIN32
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_CMD_TE_KEY, cmd_te);
-#endif
-
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_FILE_TE_KEY, file_te);
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_SUMMARY_RB_KEY, summary_rb);
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_HEX_CB_KEY, hex_cb);
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_EXPAND_ALL_RB_KEY,
-                      expand_all_rb);
-  gtk_object_set_data(GTK_OBJECT(ok_bt), PRINT_SUPPRESS_UNMARKED_CB_KEY,
-                      marked_cb);
-  gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-                     GTK_SIGNAL_FUNC(print_ok_cb), GTK_OBJECT(print_w));
 #else
   ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_FORMAT_RB_KEY, format_rb);
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_DEST_RB_KEY, dest_rb);
+#endif
+  OBJECT_SET_DATA(ok_bt, PRINT_FORMAT_RB_KEY, format_rb);
+  OBJECT_SET_DATA(ok_bt, PRINT_DEST_RB_KEY, dest_rb);
 #ifndef _WIN32
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_CMD_TE_KEY, cmd_te);
+  OBJECT_SET_DATA(ok_bt, PRINT_CMD_TE_KEY, cmd_te);
 #endif
 
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_FILE_TE_KEY, file_te);
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_SUMMARY_RB_KEY, summary_rb);
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_HEX_CB_KEY, hex_cb);
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_EXPAND_ALL_RB_KEY, expand_all_rb);
-  g_object_set_data(G_OBJECT(ok_bt), PRINT_SUPPRESS_UNMARKED_CB_KEY, marked_cb);
-  g_signal_connect(G_OBJECT(ok_bt), "clicked",
-                   G_CALLBACK(print_ok_cb), G_OBJECT(print_w));
-#endif
+  OBJECT_SET_DATA(ok_bt, PRINT_FILE_TE_KEY, file_te);
+  OBJECT_SET_DATA(ok_bt, PRINT_SUMMARY_RB_KEY, summary_rb);
+  OBJECT_SET_DATA(ok_bt, PRINT_HEX_CB_KEY, hex_cb);
+  OBJECT_SET_DATA(ok_bt, PRINT_EXPAND_ALL_RB_KEY, expand_all_rb);
+  OBJECT_SET_DATA(ok_bt, PRINT_SUPPRESS_UNMARKED_CB_KEY, marked_cb);
+  SIGNAL_CONNECT(ok_bt, "clicked", print_ok_cb, print_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
@@ -457,13 +417,10 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
 #if GTK_MAJOR_VERSION < 2
   cancel_bt = gtk_button_new_with_label ("Cancel");
-  gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
-                     GTK_SIGNAL_FUNC(print_close_cb), GTK_OBJECT(print_w));
 #else
   cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  g_signal_connect(G_OBJECT(cancel_bt), "clicked",
-                   G_CALLBACK(print_close_cb), GTK_OBJECT(print_w));
 #endif
+  SIGNAL_CONNECT(cancel_bt, "clicked", print_close_cb, print_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
   gtk_widget_show(cancel_bt);
@@ -496,15 +453,11 @@ print_cmd_toggle_dest(GtkWidget *widget, gpointer data _U_)
   int            to_file;
 
 #ifndef _WIN32
-  cmd_lb = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_CMD_LB_KEY));
-  cmd_te = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_CMD_TE_KEY));
-#endif
-  file_bt = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_FILE_BT_KEY));
-  file_te = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_FILE_TE_KEY));
+  cmd_lb = GTK_WIDGET(OBJECT_GET_DATA(widget, PRINT_CMD_LB_KEY));
+  cmd_te = GTK_WIDGET(OBJECT_GET_DATA(widget, PRINT_CMD_TE_KEY));
+#endif
+  file_bt = GTK_WIDGET(OBJECT_GET_DATA(widget, PRINT_FILE_BT_KEY));
+  file_te = GTK_WIDGET(OBJECT_GET_DATA(widget, PRINT_FILE_TE_KEY));
   if (GTK_TOGGLE_BUTTON (widget)->active) {
     /* They selected "Print to File" */
     to_file = TRUE;
@@ -527,12 +480,10 @@ print_cmd_toggle_detail(GtkWidget *widget, gpointer data _U_)
   GtkWidget     *expand_all_rb, *as_displayed_rb, *hex_cb;
   gboolean      print_detail;
 
-  expand_all_rb = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_EXPAND_ALL_RB_KEY));
-  as_displayed_rb = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_AS_DISPLAYED_RB_KEY));
-  hex_cb = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget),
-    PRINT_HEX_CB_KEY));
+  expand_all_rb = GTK_WIDGET(OBJECT_GET_DATA(widget, PRINT_EXPAND_ALL_RB_KEY));
+  as_displayed_rb = GTK_WIDGET(OBJECT_GET_DATA(widget,
+                                               PRINT_AS_DISPLAYED_RB_KEY));
+  hex_cb = GTK_WIDGET(OBJECT_GET_DATA(widget, PRINT_HEX_CB_KEY));
   if (GTK_TOGGLE_BUTTON (widget)->active) {
     /* They selected "Print detail" */
     print_detail = TRUE;
@@ -553,7 +504,7 @@ print_file_cb(GtkWidget *file_bt, gpointer file_te)
 
   /* Has a file selection dialog box already been opened for that top-level
      widget? */
-  fs = gtk_object_get_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY);
+  fs = OBJECT_GET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY);
 
   if (fs != NULL) {
     /* Yes.  Just re-activate that dialog box. */
@@ -568,47 +519,24 @@ print_file_cb(GtkWidget *file_bt, gpointer file_te)
   if (last_open_dir)
     gtk_file_selection_set_filename(GTK_FILE_SELECTION(fs), last_open_dir);
 
-#if GTK_MAJOR_VERSION < 2
-  gtk_object_set_data(GTK_OBJECT(fs), PRINT_FILE_TE_KEY, file_te);
-
-  /* Set the E_FS_CALLER_PTR_KEY for the new dialog to point to our caller. */
-  gtk_object_set_data(GTK_OBJECT(fs), E_FS_CALLER_PTR_KEY, caller);
-
-  /* Set the E_FILE_SEL_DIALOG_PTR_KEY for the caller to point to us */
-  gtk_object_set_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, fs);
-
-  /* Call a handler when the file selection box is destroyed, so we can inform
-     our caller, if any, that it's been destroyed. */
-  gtk_signal_connect(GTK_OBJECT(fs), "destroy",
-                     GTK_SIGNAL_FUNC(print_fs_destroy_cb), file_te);
-
-  gtk_signal_connect(GTK_OBJECT (GTK_FILE_SELECTION(fs)->ok_button), "clicked",
-                     (GtkSignalFunc) print_fs_ok_cb, fs);
-
-  /* Connect the cancel_button to destroy the widget */
-  gtk_signal_connect(GTK_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button),
-                     "clicked", (GtkSignalFunc) print_fs_cancel_cb, fs);
-#else
-  g_object_set_data(G_OBJECT(fs), PRINT_FILE_TE_KEY, file_te);
+  OBJECT_SET_DATA(fs, PRINT_FILE_TE_KEY, file_te);
 
   /* Set the E_FS_CALLER_PTR_KEY for the new dialog to point to our caller. */
-  g_object_set_data(G_OBJECT(fs), E_FS_CALLER_PTR_KEY, caller);
+  OBJECT_SET_DATA(fs, E_FS_CALLER_PTR_KEY, caller);
 
   /* Set the E_FILE_SEL_DIALOG_PTR_KEY for the caller to point to us */
-  g_object_set_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, fs);
+  OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, fs);
 
   /* Call a handler when the file selection box is destroyed, so we can inform
      our caller, if any, that it's been destroyed. */
-  g_signal_connect(G_OBJECT(fs), "destroy",
-                   G_CALLBACK(print_fs_destroy_cb), file_te);
+  SIGNAL_CONNECT(fs, "destroy", GTK_SIGNAL_FUNC(print_fs_destroy_cb), file_te);
 
-  g_signal_connect(G_OBJECT (GTK_FILE_SELECTION(fs)->ok_button), "clicked",
-                   G_CALLBACK(print_fs_ok_cb), fs);
+  SIGNAL_CONNECT(GTK_FILE_SELECTION(fs)->ok_button, "clicked", print_fs_ok_cb,
+                 fs);
 
   /* Connect the cancel_button to destroy the widget */
-  g_signal_connect(G_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button), "clicked",
-                   G_CALLBACK(print_fs_cancel_cb), fs);
-#endif
+  SIGNAL_CONNECT(GTK_FILE_SELECTION(fs)->cancel_button, "clicked",
+                 print_fs_cancel_cb, fs);
 
   /* Catch the "key_press_event" signal in the window, so that we can catch
      the ESC key being pressed and act as if the "Cancel" button had
@@ -637,8 +565,8 @@ print_fs_ok_cb(GtkWidget *w _U_, gpointer data)
         return;
   }
 
-  gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data),
-      PRINT_FILE_TE_KEY)), f_name);
+  gtk_entry_set_text(GTK_ENTRY(OBJECT_GET_DATA(data, PRINT_FILE_TE_KEY)),
+                     f_name);
   gtk_widget_destroy(GTK_WIDGET(data));
 
   g_free(f_name);
@@ -658,10 +586,10 @@ print_fs_destroy_cb(GtkWidget *win, GtkWidget* file_te)
   /* Get the widget that requested that we be popped up.
      (It should arrange to destroy us if it's destroyed, so
      that we don't get a pointer to a non-existent window here.) */
-  caller = gtk_object_get_data(GTK_OBJECT(win), E_FS_CALLER_PTR_KEY);
+  caller = OBJECT_GET_DATA(win, E_FS_CALLER_PTR_KEY);
 
   /* Tell it we no longer exist. */
-  gtk_object_set_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, NULL);
+  OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, NULL);
 
   /* Now nuke this window. */
   gtk_grab_remove(GTK_WIDGET(win));
@@ -699,14 +627,13 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
   int win_printer_flag = FALSE;
 #endif
 
-  button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(ok_bt),
-                                              PRINT_DEST_RB_KEY);
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_DEST_RB_KEY);
   print_to_file = GTK_TOGGLE_BUTTON (button)->active;
   print_args.to_file = print_to_file;
 
   if (print_args.to_file) {
-    g_dest = gtk_entry_get_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(ok_bt),
-      PRINT_FILE_TE_KEY)));
+    g_dest = gtk_entry_get_text(GTK_ENTRY(OBJECT_GET_DATA(ok_bt,
+                                                          PRINT_FILE_TE_KEY)));
     if (!g_dest[0]) {
       simple_dialog(ESD_TYPE_CRIT, NULL,
         "Printing to file, but no file specified.");
@@ -723,33 +650,28 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
     win_printer_flag = TRUE;
     setup_mswin_print(&print_args);
 #else
-    print_args.dest = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(ok_bt),
+    print_args.dest = g_strdup(gtk_entry_get_text(GTK_ENTRY(OBJECT_GET_DATA(ok_bt,
       PRINT_CMD_TE_KEY))));
 #endif
   }
 
-  button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(ok_bt),
-                                              PRINT_FORMAT_RB_KEY);
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_FORMAT_RB_KEY);
   if (GTK_TOGGLE_BUTTON (button)->active)
     print_format = PR_FMT_PS;
   else
     print_format = PR_FMT_TEXT;
   print_args.format = print_format;
 
-  button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(ok_bt),
-                                              PRINT_SUMMARY_RB_KEY);
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_SUMMARY_RB_KEY);
   print_args.print_summary = GTK_TOGGLE_BUTTON (button)->active;
 
-  button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(ok_bt),
-                                              PRINT_HEX_CB_KEY);
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_HEX_CB_KEY);
   print_args.print_hex = GTK_TOGGLE_BUTTON (button)->active;
 
-  button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(ok_bt),
-                                              PRINT_EXPAND_ALL_RB_KEY);
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_EXPAND_ALL_RB_KEY);
   print_args.expand_all = GTK_TOGGLE_BUTTON (button)->active;
 
-  button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(ok_bt),
-                                              PRINT_SUPPRESS_UNMARKED_CB_KEY);
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_SUPPRESS_UNMARKED_CB_KEY);
   print_args.suppress_unmarked = GTK_TOGGLE_BUTTON (button)->active;
 
   gtk_widget_destroy(GTK_WIDGET(parent_w));
@@ -790,7 +712,7 @@ print_destroy_cb(GtkWidget *win, gpointer user_data _U_)
 
   /* Is there a file selection dialog associated with this
      Print File dialog? */
-  fs = gtk_object_get_data(GTK_OBJECT(win), E_FILE_SEL_DIALOG_PTR_KEY);
+  fs = OBJECT_GET_DATA(win, E_FILE_SEL_DIALOG_PTR_KEY);
 
   if (fs != NULL) {
     /* Yes.  Destroy it. */
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 5301cae68b..815bc2ec6a 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -1,7 +1,7 @@
 /* print_prefs.c
  * Dialog boxes for preferences for printing
  *
- * $Id: print_prefs.c,v 1.15 2002/11/03 17:38:34 oabad Exp $
+ * $Id: print_prefs.c,v 1.16 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,6 +38,7 @@
 #include "util.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
+#include "compat_macros.h"
 
 static void printer_opts_file_cb(GtkWidget *w, gpointer te);
 static void printer_opts_fs_ok_cb(GtkWidget *w, gpointer data);
@@ -87,19 +88,19 @@ GtkWidget * printer_prefs_show(void)
 	/* Output format */
 	button = create_preference_radio_buttons(main_tb, 0, "Format:",
 	   NULL, print_format_vals, prefs.pr_format);
-	gtk_object_set_data(GTK_OBJECT(main_vb), E_PRINT_FORMAT_KEY, button);
+	OBJECT_SET_DATA(main_vb, E_PRINT_FORMAT_KEY, button);
 
 	/* Output destination */
 	button = create_preference_radio_buttons(main_tb, 1, "Print to:",
 	   NULL, print_dest_vals, prefs.pr_dest);
-	gtk_object_set_data(GTK_OBJECT(main_vb), E_PRINT_DESTINATION_KEY,
+	OBJECT_SET_DATA(main_vb, E_PRINT_DESTINATION_KEY,
 	   button);
 
 #ifndef _WIN32
 	/* Command text entry */
 	cmd_te = create_preference_entry(main_tb, 2, "Command:", NULL,
 	  prefs.pr_cmd);
-	gtk_object_set_data(GTK_OBJECT(main_vb), PRINT_CMD_TE_KEY, cmd_te);
+	OBJECT_SET_DATA(main_vb, PRINT_CMD_TE_KEY, cmd_te);
 #endif
 
 	/* File button and text entry */
@@ -112,19 +113,12 @@ GtkWidget * printer_prefs_show(void)
 	gtk_widget_show(file_bt);
 
 	file_te = gtk_entry_new();
-	gtk_object_set_data(GTK_OBJECT(main_vb), PRINT_FILE_TE_KEY, file_te);
+	OBJECT_SET_DATA(main_vb, PRINT_FILE_TE_KEY, file_te);
 	if (prefs.pr_file) gtk_entry_set_text(GTK_ENTRY(file_te), prefs.pr_file);
 	gtk_table_attach_defaults(GTK_TABLE(main_tb), file_te, 1, 2, 3, 4);
 	gtk_widget_show(file_te);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(file_bt), "clicked",
-                           GTK_SIGNAL_FUNC(printer_opts_file_cb),
-                           GTK_OBJECT(file_te));
-#else
-        g_signal_connect(G_OBJECT(file_bt), "clicked",
-                         G_CALLBACK(printer_opts_file_cb), G_OBJECT(file_te));
-#endif
+	SIGNAL_CONNECT(file_bt, "clicked", printer_opts_file_cb, file_te);
 
 	gtk_widget_show(main_vb);
 	return(main_vb);
@@ -138,7 +132,7 @@ printer_opts_file_cb(GtkWidget *file_bt, gpointer file_te) {
 
   /* Has a file selection dialog box already been opened for that top-level
      widget? */
-  fs = gtk_object_get_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY);
+  fs = OBJECT_GET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY);
 
   if (fs != NULL) {
     /* Yes.  Just re-activate that dialog box. */
@@ -147,45 +141,24 @@ printer_opts_file_cb(GtkWidget *file_bt, gpointer file_te) {
   }
 
   fs = gtk_file_selection_new ("Ethereal: Print to a File");
-	gtk_object_set_data(GTK_OBJECT(fs), PRINT_FILE_TE_KEY, file_te);
+	OBJECT_SET_DATA(fs, PRINT_FILE_TE_KEY, file_te);
 
-#if GTK_MAJOR_VERSION < 2
   /* Set the E_FS_CALLER_PTR_KEY for the new dialog to point to our caller. */
-  gtk_object_set_data(GTK_OBJECT(fs), E_FS_CALLER_PTR_KEY, caller);
+  OBJECT_SET_DATA(fs, E_FS_CALLER_PTR_KEY, caller);
 
   /* Set the E_FILE_SEL_DIALOG_PTR_KEY for the caller to point to us */
-  gtk_object_set_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, fs);
+  OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, fs);
 
   /* Call a handler when the file selection box is destroyed, so we can inform
      our caller, if any, that it's been destroyed. */
-  gtk_signal_connect(GTK_OBJECT(fs), "destroy",
-                     GTK_SIGNAL_FUNC(printer_opts_fs_destroy_cb), NULL);
+  SIGNAL_CONNECT(fs, "destroy", printer_opts_fs_destroy_cb, NULL);
 
-  gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(fs)->ok_button),
-                      "clicked", (GtkSignalFunc) printer_opts_fs_ok_cb, fs);
+  SIGNAL_CONNECT(GTK_FILE_SELECTION(fs)->ok_button, "clicked",
+                 printer_opts_fs_ok_cb, fs);
 
   /* Connect the cancel_button to destroy the widget */
-  gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button),
-                      "clicked", (GtkSignalFunc) printer_opts_fs_cancel_cb, fs);
-#else
-  /* Set the E_FS_CALLER_PTR_KEY for the new dialog to point to our caller. */
-  g_object_set_data(G_OBJECT(fs), E_FS_CALLER_PTR_KEY, caller);
-
-  /* Set the E_FILE_SEL_DIALOG_PTR_KEY for the caller to point to us */
-  g_object_set_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, fs);
-
-  /* Call a handler when the file selection box is destroyed, so we can inform
-     our caller, if any, that it's been destroyed. */
-  g_signal_connect(G_OBJECT(fs), "destroy",
-                   G_CALLBACK(printer_opts_fs_destroy_cb), NULL);
-
-  g_signal_connect(G_OBJECT (GTK_FILE_SELECTION(fs)->ok_button), "clicked",
-                   G_CALLBACK(printer_opts_fs_ok_cb), fs);
-
-  /* Connect the cancel_button to destroy the widget */
-  g_signal_connect(G_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button), "clicked",
-                   G_CALLBACK(printer_opts_fs_cancel_cb), fs);
-#endif
+  SIGNAL_CONNECT(GTK_FILE_SELECTION(fs)->cancel_button, "clicked",
+                 printer_opts_fs_cancel_cb, fs);
 
   /* Catch the "key_press_event" signal in the window, so that we can catch
      the ESC key being pressed and act as if the "Cancel" button had
@@ -198,9 +171,8 @@ printer_opts_file_cb(GtkWidget *file_bt, gpointer file_te) {
 static void
 printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) {
 
-	gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data),
-  	PRINT_FILE_TE_KEY)),
-		gtk_file_selection_get_filename (GTK_FILE_SELECTION(data)));
+	gtk_entry_set_text(GTK_ENTRY(OBJECT_GET_DATA(data, PRINT_FILE_TE_KEY)),
+		gtk_file_selection_get_filename(GTK_FILE_SELECTION(data)));
 	printer_opts_fs_cancel_cb(w, data);
 }
 
@@ -218,10 +190,10 @@ printer_opts_fs_destroy_cb(GtkWidget *win, gpointer data _U_)
   /* Get the widget that requested that we be popped up.
      (It should arrange to destroy us if it's destroyed, so
      that we don't get a pointer to a non-existent window here.) */
-  caller = gtk_object_get_data(GTK_OBJECT(win), E_FS_CALLER_PTR_KEY);
+  caller = OBJECT_GET_DATA(win, E_FS_CALLER_PTR_KEY);
 
   /* Tell it we no longer exist. */
-  gtk_object_set_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, NULL);
+  OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, NULL);
 
   /* Now nuke this window. */
   gtk_grab_remove(GTK_WIDGET(win));
@@ -232,26 +204,22 @@ void
 printer_prefs_fetch(GtkWidget *w)
 {
   prefs.pr_format = fetch_preference_radio_buttons_val(
-	gtk_object_get_data(GTK_OBJECT(w), E_PRINT_FORMAT_KEY),
-	print_format_vals);
+	OBJECT_GET_DATA(w, E_PRINT_FORMAT_KEY), print_format_vals);
 
   prefs.pr_dest = fetch_preference_radio_buttons_val(
-	gtk_object_get_data(GTK_OBJECT(w), E_PRINT_DESTINATION_KEY),
-	print_dest_vals);
+	OBJECT_GET_DATA(w, E_PRINT_DESTINATION_KEY), print_dest_vals);
 
 #ifndef _WIN32
   if (prefs.pr_cmd)
     g_free(prefs.pr_cmd);
   prefs.pr_cmd = g_strdup(gtk_entry_get_text(
-			  GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(w),
-			  PRINT_CMD_TE_KEY))));
+			  GTK_ENTRY(OBJECT_GET_DATA(w, PRINT_CMD_TE_KEY))));
 #endif
 
   if (prefs.pr_file)
     g_free(prefs.pr_file);
   prefs.pr_file = g_strdup(gtk_entry_get_text(
-			   GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(w),
-			   PRINT_FILE_TE_KEY))));
+			   GTK_ENTRY(OBJECT_GET_DATA(w, PRINT_FILE_TE_KEY))));
 }
 
 void
@@ -267,7 +235,7 @@ printer_prefs_destroy(GtkWidget *w)
 
   /* Is there a file selection dialog associated with this
      Preferences dialog? */
-  fs = gtk_object_get_data(GTK_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY);
+  fs = OBJECT_GET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY);
 
   if (fs != NULL) {
     /* Yes.  Destroy it. */
diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c
index 9c26a822bd..38d9fb863e 100644
--- a/gtk/progress_dlg.c
+++ b/gtk/progress_dlg.c
@@ -1,7 +1,7 @@
 /* progress_dlg.c
  * Routines for progress-bar (modal) dialog
  *
- * $Id: progress_dlg.c,v 1.16 2002/11/03 17:38:34 oabad Exp $
+ * $Id: progress_dlg.c,v 1.17 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -30,6 +30,7 @@
 #include "gtkglobals.h"
 #include "dlg_utils.h"
 #include "progress_dlg.h"
+#include "compat_macros.h"
 
 #define	PROG_BAR_KEY	"progress_bar"
 
@@ -176,7 +177,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
 	/*
 	 * Attach a pointer to the progress bar widget to the top-level widget.
 	 */
-	gtk_object_set_data(GTK_OBJECT(dlg_w), PROG_BAR_KEY, prog_bar);
+	OBJECT_SET_DATA(dlg_w, PROG_BAR_KEY, prog_bar);
 
 	/*
 	 * Static and dynamic boxes are now complete
@@ -202,18 +203,8 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
 	 */
 	stop_bt = gtk_button_new_with_label(stop_title);
 	gtk_box_pack_start(GTK_BOX (bbox), stop_bt, TRUE, TRUE, 0);
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(stop_bt), "clicked",
-                           GTK_SIGNAL_FUNC(stop_cb), (gpointer) stop_flag);
-	gtk_signal_connect(GTK_OBJECT(dlg_w), "delete_event",
-                           GTK_SIGNAL_FUNC(delete_event_cb),
-                           (gpointer) stop_flag);
-#else
-	g_signal_connect(G_OBJECT(stop_bt), "clicked",
-                         G_CALLBACK(stop_cb), (gpointer) stop_flag);
-	g_signal_connect(G_OBJECT(dlg_w), "delete_event",
-                         G_CALLBACK(delete_event_cb), (gpointer) stop_flag);
-#endif
+	SIGNAL_CONNECT(stop_bt, "clicked", stop_cb, stop_flag);
+	SIGNAL_CONNECT(dlg_w, "delete_event", delete_event_cb, stop_flag);
 	GTK_WIDGET_SET_FLAGS(stop_bt, GTK_CAN_DEFAULT);
 	gtk_widget_grab_default(stop_bt);
 	GTK_WIDGET_SET_FLAGS(stop_bt, GTK_CAN_DEFAULT);
@@ -372,7 +363,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, gchar *status)
 	}
 
 	/* update progress bar */
-	prog_bar = gtk_object_get_data(GTK_OBJECT(dlg_w), PROG_BAR_KEY);
+	prog_bar = OBJECT_GET_DATA(dlg_w, PROG_BAR_KEY);
 #if GTK_MAJOR_VERSION < 2
 	gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), percentage);
 #else
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 4602096ba7..54522b457d 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
 /* proto_dlg.c
  *
- * $Id: proto_dlg.c,v 1.16 2002/11/03 17:38:34 oabad Exp $
+ * $Id: proto_dlg.c,v 1.17 2002/11/11 15:39:06 oabad Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
@@ -37,6 +37,7 @@
 #include "ui_util.h"
 #include "dlg_utils.h"
 #include "proto_dlg.h"
+#include "compat_macros.h"
 
 static gboolean proto_delete_cb(GtkWidget *, gpointer);
 static void proto_ok_cb(GtkWidget *, gpointer);
@@ -76,20 +77,9 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
   }
 
   proto_w = dlg_window_new("Ethereal: Protocol");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(proto_w), "delete_event",
-		     GTK_SIGNAL_FUNC(proto_delete_cb), NULL);
-  gtk_signal_connect(GTK_OBJECT(proto_w), "destroy",
-		     GTK_SIGNAL_FUNC(proto_destroy_cb), NULL);
-  gtk_widget_set_usize(GTK_WIDGET(proto_w), DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3);
-#else
-  g_signal_connect(G_OBJECT(proto_w), "delete_event",
-                   G_CALLBACK(proto_delete_cb), NULL);
-  g_signal_connect(G_OBJECT(proto_w), "destroy",
-                   G_CALLBACK(proto_destroy_cb), NULL);
-  gtk_widget_set_size_request(GTK_WIDGET(proto_w), DEF_WIDTH * 2/3,
-                              DEF_HEIGHT * 2/3);
-#endif
+  SIGNAL_CONNECT(proto_w, "delete_event", proto_delete_cb, NULL);
+  SIGNAL_CONNECT(proto_w, "destroy", proto_destroy_cb, NULL);
+  WIDGET_SET_SIZE(proto_w, DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3);
 
   /* Container for each row of widgets */
 
@@ -103,13 +93,7 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
   proto_nb = gtk_notebook_new();
   gtk_container_add(GTK_CONTAINER(main_vb), proto_nb);
   /* XXX do not know why I need this to fill all space around buttons */
-#if GTK_MAJOR_VERSION < 2
-  gtk_widget_set_usize(GTK_WIDGET(proto_nb), DEF_WIDTH * 2/3 - 50,
-		       DEF_HEIGHT * 2/3 - 50);
-#else
-  gtk_widget_set_size_request(GTK_WIDGET(proto_nb), DEF_WIDTH * 2/3 - 50,
-		       DEF_HEIGHT * 2/3 - 50);
-#endif
+  WIDGET_SET_SIZE(proto_nb, DEF_WIDTH * 2/3 - 50, DEF_HEIGHT * 2/3 - 50);
 
   /* Protocol selection panel ("enable/disable" protocols) */
 
@@ -143,37 +127,19 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
 
   /* Toggle All */
   button = gtk_button_new_with_label("Toggle All");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                     GTK_SIGNAL_FUNC(toggle_all_cb), GTK_OBJECT(proto_w));
-#else
-  g_signal_connect(G_OBJECT(button), "clicked",
-                   G_CALLBACK(toggle_all_cb), GTK_OBJECT(proto_w));
-#endif
+  SIGNAL_CONNECT(button, "clicked", toggle_all_cb, proto_w);
   gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
   /* Enable All */
   button = gtk_button_new_with_label("Enable All");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                     GTK_SIGNAL_FUNC(enable_all_cb), GTK_OBJECT(proto_w));
-#else
-  g_signal_connect(G_OBJECT(button), "clicked",
-                   G_CALLBACK(enable_all_cb), GTK_OBJECT(proto_w));
-#endif
+  SIGNAL_CONNECT(button, "clicked", enable_all_cb, proto_w);
   gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
   /* Disable All */
   button = gtk_button_new_with_label("Disable All");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                     GTK_SIGNAL_FUNC(disable_all_cb), GTK_OBJECT(proto_w));
-#else
-  g_signal_connect(G_OBJECT(button), "clicked",
-                   G_CALLBACK(disable_all_cb), GTK_OBJECT(proto_w));
-#endif
+  SIGNAL_CONNECT(button, "clicked", disable_all_cb, proto_w);
   gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
@@ -192,13 +158,10 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
 
 #if GTK_MAJOR_VERSION < 2
   ok_bt = gtk_button_new_with_label ("OK");
-  gtk_signal_connect(GTK_OBJECT(ok_bt), "clicked",
-		     GTK_SIGNAL_FUNC(proto_ok_cb), GTK_OBJECT(proto_w));
 #else
   ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_signal_connect(G_OBJECT(ok_bt), "clicked",
-                   G_CALLBACK(proto_ok_cb), GTK_OBJECT(proto_w));
 #endif
+  SIGNAL_CONNECT(ok_bt, "clicked", proto_ok_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
@@ -206,33 +169,27 @@ void proto_cb(GtkWidget *w _U_, gpointer data _U_)
 
 #if GTK_MAJOR_VERSION < 2
   apply_bt = gtk_button_new_with_label ("Apply");
-  gtk_signal_connect(GTK_OBJECT(apply_bt), "clicked",
-		     GTK_SIGNAL_FUNC(proto_apply_cb), GTK_OBJECT(proto_w));
 #else
   apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-  g_signal_connect(G_OBJECT(apply_bt), "clicked",
-                   G_CALLBACK(proto_apply_cb), GTK_OBJECT(proto_w));
 #endif
+  SIGNAL_CONNECT(apply_bt, "clicked", proto_apply_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), apply_bt, TRUE, TRUE, 0);
   gtk_widget_show(apply_bt);
 
 #if GTK_MAJOR_VERSION < 2
   cancel_bt = gtk_button_new_with_label ("Cancel");
-  gtk_signal_connect(GTK_OBJECT(cancel_bt), "clicked",
-		     GTK_SIGNAL_FUNC(proto_cancel_cb), GTK_OBJECT(proto_w));
 #else
   cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-  g_signal_connect(G_OBJECT(cancel_bt), "clicked",
-                   G_CALLBACK(proto_cancel_cb), GTK_OBJECT(proto_w));
 #endif
+  SIGNAL_CONNECT(cancel_bt, "clicked", proto_cancel_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
   gtk_widget_show(cancel_bt);
 
   dlg_set_cancel(proto_w, cancel_bt);
 
-  gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(proto_w));
+  gtk_quit_add_destroy(gtk_main_level(), proto_w);
   gtk_widget_show(proto_w);
 
 } /* proto_cb */
@@ -249,8 +206,7 @@ toggle_all_cb(GtkWidget *button _U_, gpointer parent_w)
     GtkWidget *button;
     protocol_data_t *p = entry->data;
 
-    button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w),
-					       p->abbrev);
+    button = (GtkWidget *)OBJECT_GET_DATA(parent_w, p->abbrev);
     /* gtk_toggle_button_toggled() didn't work for me... */
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
 		    !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
@@ -268,8 +224,7 @@ set_active_all(gpointer parent_w, gboolean new_state)
     GtkWidget *button;
     protocol_data_t *p = entry->data;
 
-    button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w),
-					       p->abbrev);
+    button = (GtkWidget *)OBJECT_GET_DATA(parent_w, p->abbrev);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), new_state);
   }
 }
@@ -351,8 +306,7 @@ static gboolean set_proto_selection(GtkWidget *parent_w)
     GtkWidget *button;
     protocol_data_t *p = entry->data;
 
-    button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w),
-					       p->abbrev);
+    button = (GtkWidget *)OBJECT_GET_DATA(parent_w, p->abbrev);
     if (proto_is_protocol_enabled(p->hfinfo_index) != GTK_TOGGLE_BUTTON (button)->active) {
       proto_set_decoding(p->hfinfo_index, GTK_TOGGLE_BUTTON (button)->active);
       need_redissect = TRUE;
@@ -441,7 +395,7 @@ static void show_proto_selection(GtkWidget *main, GtkWidget *container)
     gtk_tooltips_set_tip(tooltips, button, p->name, NULL);
     gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
 				proto_is_protocol_enabled(p->hfinfo_index));
-    gtk_object_set_data(GTK_OBJECT(main), p->abbrev, button);
+    OBJECT_SET_DATA(main, p->abbrev, button);
     gtk_table_attach_defaults (GTK_TABLE (table), button, l, l+1, t, t+1);
     gtk_widget_show (button);
     if (++nb_proto % NB_COL) {
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index a2a6d87334..e94b6719b1 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
 /* proto_draw.c
  * Routines for GTK+ packet display
  *
- * $Id: proto_draw.c,v 1.60 2002/11/03 17:38:34 oabad Exp $
+ * $Id: proto_draw.c,v 1.61 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -48,6 +48,7 @@
 #include "packet_win.h"
 #include "ui_util.h"
 #include "gtkglobals.h"
+#include "compat_macros.h"
 
 #define BYTE_VIEW_WIDTH    16
 #define BYTE_VIEW_SEP      8
@@ -92,8 +93,7 @@ get_byte_view_data_and_length(GtkWidget *byte_view, guint *data_len)
   tvbuff_t *byte_view_tvb;
   const guint8 *data_ptr;
 
-  byte_view_tvb = gtk_object_get_data(GTK_OBJECT(byte_view),
-				      E_BYTE_VIEW_TVBUFF_KEY);
+  byte_view_tvb = OBJECT_GET_DATA(byte_view, E_BYTE_VIEW_TVBUFF_KEY);
   if (byte_view_tvb == NULL)
     return NULL;
 
@@ -117,7 +117,7 @@ set_notebook_page(GtkWidget *nb_ptr, tvbuff_t *tvb)
        (bv_page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb_ptr), num)) != NULL;
        num++) {
     bv = GTK_BIN(bv_page)->child;
-    bv_tvb = gtk_object_get_data(GTK_OBJECT(bv), E_BYTE_VIEW_TVBUFF_KEY);
+    bv_tvb = OBJECT_GET_DATA(bv, E_BYTE_VIEW_TVBUFF_KEY);
     if (bv_tvb == tvb) {
       /* Found it. */
       gtk_notebook_set_page(GTK_NOTEBOOK(nb_ptr), num);
@@ -314,8 +314,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
      * Get the number of digits of offset being displayed, and
      * compute the columns of various parts of the display.
      */
-    ndigits = GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(bv),
-                                                   E_BYTE_VIEW_NDIGITS_KEY));
+    ndigits = GPOINTER_TO_UINT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_NDIGITS_KEY));
 
     /*
      * The column of the first hex digit in the first half.
@@ -384,7 +383,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
      */
     text_end_2 = text_start_2 + BYTES_PER_LINE/2 - 1;
 
-    tree = gtk_object_get_data(GTK_OBJECT(widget), E_BYTE_VIEW_TREE_PTR);
+    tree = OBJECT_GET_DATA(widget, E_BYTE_VIEW_TREE_PTR);
     if (tree == NULL) {
         /*
          * Somebody clicked on the dummy byte view; do nothing.
@@ -392,11 +391,10 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
         return FALSE;
     }
 #if GTK_MAJOR_VERSION < 2
-    ctree = GTK_CTREE(gtk_object_get_data(GTK_OBJECT(widget),
-                                          E_BYTE_VIEW_TREE_VIEW_PTR));
+    ctree = GTK_CTREE(OBJECT_GET_DATA(widget, E_BYTE_VIEW_TREE_VIEW_PTR));
 #else
-    tree_view = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(widget),
-                                                E_BYTE_VIEW_TREE_VIEW_PTR));
+    tree_view = GTK_TREE_VIEW(OBJECT_GET_DATA(widget,
+                                              E_BYTE_VIEW_TREE_VIEW_PTR));
 #endif
 
 #if GTK_MAJOR_VERSION < 2
@@ -448,7 +446,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event)
     byte += row * 16;
 
     /* Get the data source tvbuff */
-    tvb = gtk_object_get_data(GTK_OBJECT(widget), E_BYTE_VIEW_TVBUFF_KEY);
+    tvb = OBJECT_GET_DATA(widget, E_BYTE_VIEW_TVBUFF_KEY);
 
     /* Find the finfo that corresponds to our byte. */
     finfo = proto_find_field_from_offset(tree, byte, tvb);
@@ -551,7 +549,7 @@ create_byte_view(gint bv_size, GtkWidget *pane)
 
   gtk_paned_pack2(GTK_PANED(pane), byte_nb, FALSE, FALSE);
 #if GTK_MAJOR_VERSION < 2
-  gtk_widget_set_usize(byte_nb, -1, bv_size);
+  WIDGET_SET_SIZE(byte_nb, -1, bv_size);
 #else
   gtk_widget_set_size_request(byte_nb, -1, bv_size);
 #endif
@@ -621,8 +619,6 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb,
   gtk_text_set_editable(GTK_TEXT(byte_view), FALSE);
   gtk_text_set_word_wrap(GTK_TEXT(byte_view), FALSE);
   gtk_text_set_line_wrap(GTK_TEXT(byte_view), FALSE);
-  gtk_object_set_data(GTK_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY,
-		      (gpointer)tvb);
 #else
   byte_view = gtk_text_view_new();
   gtk_text_view_set_editable(GTK_TEXT_VIEW(byte_view), FALSE);
@@ -636,30 +632,16 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb,
                              "background-gdk", &style->base[GTK_STATE_SELECTED],
                              NULL);
   gtk_text_buffer_create_tag(buf, "bold", "font-desc", m_b_font, NULL);
-  g_object_set_data(G_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY, (gpointer)tvb);
 #endif
+  OBJECT_SET_DATA(byte_view, E_BYTE_VIEW_TVBUFF_KEY, tvb);
   gtk_container_add(GTK_CONTAINER(byte_scrollw), byte_view);
 
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(byte_view), "show",
-		     GTK_SIGNAL_FUNC(byte_view_realize_cb), NULL);
-  gtk_signal_connect(GTK_OBJECT(byte_view), "button_press_event",
-		     GTK_SIGNAL_FUNC(byte_view_button_press_cb),
-		     gtk_object_get_data(GTK_OBJECT(popup_menu_object),
-					 PM_HEXDUMP_KEY));
-#else
-  g_signal_connect(G_OBJECT(byte_view), "show",
-                   G_CALLBACK(byte_view_realize_cb), NULL);
-  g_signal_connect(G_OBJECT(byte_view), "button_press_event",
-                   G_CALLBACK(byte_view_button_press_cb),
-                   gtk_object_get_data(GTK_OBJECT(popup_menu_object),
-                                       PM_HEXDUMP_KEY));
-#endif
+  SIGNAL_CONNECT(byte_view, "show", byte_view_realize_cb, NULL);
+  SIGNAL_CONNECT(byte_view, "button_press_event", byte_view_button_press_cb,
+                 OBJECT_GET_DATA(popup_menu_object, PM_HEXDUMP_KEY));
 
-  gtk_object_set_data(GTK_OBJECT(byte_view), E_BYTE_VIEW_TREE_PTR,
-		      tree);
-  gtk_object_set_data(GTK_OBJECT(byte_view), E_BYTE_VIEW_TREE_VIEW_PTR,
-		      tree_view);
+  OBJECT_SET_DATA(byte_view, E_BYTE_VIEW_TREE_PTR, tree);
+  OBJECT_SET_DATA(byte_view, E_BYTE_VIEW_TREE_VIEW_PTR, tree_view);
 
   gtk_widget_show(byte_view);
 
@@ -771,8 +753,7 @@ packet_hex_print_common(GtkTextView *bv, const guint8 *pd, int len, int bstart,
     use_digits = 4;	/* we'll supply 4 digits */
 
   /* Record the number of digits in this text view. */
-  gtk_object_set_data(GTK_OBJECT(bv), E_BYTE_VIEW_NDIGITS_KEY,
-                      GUINT_TO_POINTER(use_digits));
+  OBJECT_SET_DATA(bv, E_BYTE_VIEW_NDIGITS_KEY, GUINT_TO_POINTER(use_digits));
 
   while (i < len) {
     /* Print the line number */
@@ -1120,9 +1101,10 @@ packet_hex_print(GtkTextView *bv, const guint8 *pd, frame_data *fd,
 
   /* save the information needed to redraw the text */
   /* should we save the fd & finfo pointers instead ?? */
-  gtk_object_set_data(GTK_OBJECT(bv),  E_BYTE_VIEW_START_KEY, GINT_TO_POINTER(bend));
-  gtk_object_set_data(GTK_OBJECT(bv),  E_BYTE_VIEW_END_KEY, GINT_TO_POINTER(bstart));
-  gtk_object_set_data(GTK_OBJECT(bv),  E_BYTE_VIEW_ENCODE_KEY, GINT_TO_POINTER(fd->flags.encoding));
+  OBJECT_SET_DATA(bv, E_BYTE_VIEW_START_KEY, GINT_TO_POINTER(bend));
+  OBJECT_SET_DATA(bv, E_BYTE_VIEW_END_KEY, GINT_TO_POINTER(bstart));
+  OBJECT_SET_DATA(bv, E_BYTE_VIEW_ENCODE_KEY,
+                  GINT_TO_POINTER(fd->flags.encoding));
 
   packet_hex_print_common(bv, pd, len, bstart, bend, fd->flags.encoding);
 }
@@ -1143,14 +1125,11 @@ packet_hex_reprint(GtkTextView *bv)
   const guint8 *data;
   guint len;
 
-  start = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(bv),
-			  E_BYTE_VIEW_START_KEY));
-  end = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(bv),
-			E_BYTE_VIEW_END_KEY));
+  start = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_START_KEY));
+  end = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_END_KEY));
   data = get_byte_view_data_and_length(GTK_WIDGET(bv), &len);
   g_assert(data != NULL);
-  encoding = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(bv),
-			     E_BYTE_VIEW_ENCODE_KEY));
+  encoding = GPOINTER_TO_INT(OBJECT_GET_DATA(bv, E_BYTE_VIEW_ENCODE_KEY));
 
   packet_hex_print_common(bv, data, len, start, end, encoding);
 }
@@ -1169,13 +1148,7 @@ remember_ptree_widget(GtkWidget *ptreew)
 
   /* Catch the "destroy" event on the widget, so that we remove it from
      the list when it's destroyed. */
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(ptreew), "destroy",
-		     GTK_SIGNAL_FUNC(forget_ptree_widget), NULL);
-#else
-  g_signal_connect(G_OBJECT(ptreew), "destroy",
-                   G_CALLBACK(forget_ptree_widget), NULL);
-#endif
+  SIGNAL_CONNECT(ptreew, "destroy", forget_ptree_widget, NULL);
 }
 
 /* Remove a protocol tree widget from the list of protocol tree widgets. */
@@ -1291,21 +1264,14 @@ create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane,
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 #endif
   gtk_paned_pack1(GTK_PANED(pane), tv_scrollw, TRUE, TRUE);
-#if GTK_MAJOR_VERSION < 2
-  gtk_widget_set_usize(tv_scrollw, -1, tv_size);
-#else
-  gtk_widget_set_size_request(tv_scrollw, -1, tv_size);
-#endif
+  WIDGET_SET_SIZE(tv_scrollw, -1, tv_size);
   gtk_widget_show(tv_scrollw);
 
 #if GTK_MAJOR_VERSION < 2
   tree_view = ctree_new(1, 0);
-  gtk_signal_connect( GTK_OBJECT(tree_view), "key-press-event",
-		      (GtkSignalFunc) toggle_tree, NULL );
-  gtk_signal_connect( GTK_OBJECT(tree_view), "tree-expand",
-		      (GtkSignalFunc) expand_tree, NULL );
-  gtk_signal_connect( GTK_OBJECT(tree_view), "tree-collapse",
-		      (GtkSignalFunc) collapse_tree, NULL );
+  SIGNAL_CONNECT(tree_view, "key-press-event", toggle_tree, NULL );
+  SIGNAL_CONNECT(tree_view, "tree-expand", expand_tree, NULL );
+  SIGNAL_CONNECT(tree_view, "tree-collapse", collapse_tree, NULL );
   /* I need this next line to make the widget work correctly with hidden
    * column titles and GTK_SELECTION_BROWSE */
   gtk_clist_set_column_auto_resize( GTK_CLIST(tree_view), 0, TRUE );
@@ -1322,10 +1288,8 @@ create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane,
                                     col_offset - 1);
   gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
                                   GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-  g_signal_connect(G_OBJECT(tree_view), "row-expanded",
-                   G_CALLBACK(expand_tree), NULL);
-  g_signal_connect(GTK_OBJECT(tree_view), "row-collapsed",
-                   G_CALLBACK(collapse_tree), NULL);
+  SIGNAL_CONNECT(tree_view, "row-expanded", expand_tree, NULL);
+  SIGNAL_CONNECT(tree_view, "row-collapsed", collapse_tree, NULL);
 #endif
   gtk_container_add( GTK_CONTAINER(tv_scrollw), tree_view );
   set_ptree_sel_browse(tree_view, prefs->gui_ptree_sel_browse);
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 199b98ba8e..502c938329 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -1,6 +1,6 @@
 /* proto_hier_stats_dlg.c
  *
- * $Id: proto_hier_stats_dlg.c,v 1.11 2002/11/03 17:38:34 oabad Exp $
+ * $Id: proto_hier_stats_dlg.c,v 1.12 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -32,6 +32,7 @@
 #include "dlg_utils.h"
 #include "ui_util.h"
 #include "main.h"
+#include "compat_macros.h"
 
 #if GTK_MAJOR_VERSION < 2
 #define NUM_STAT_COLUMNS 6
@@ -260,9 +261,9 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
 #if GTK_MAJOR_VERSION < 2
     height = GTK_CLIST(tree)->rows * (GTK_CLIST(tree)->row_height + 5);
     height = MIN(height, MAX_DLG_HEIGHT);
-    gtk_widget_set_usize(tree, DEF_DLG_WIDTH, height);
+    WIDGET_SET_SIZE(tree, DEF_DLG_WIDTH, height);
 #else
-    gtk_widget_set_size_request(tree, DEF_DLG_WIDTH, MAX_DLG_HEIGHT);
+    WIDGET_SET_SIZE(tree, DEF_DLG_WIDTH, MAX_DLG_HEIGHT);
 #endif
 
     gtk_container_add(GTK_CONTAINER(sw), tree);
@@ -287,13 +288,7 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	dlg = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(dlg), "Ethereal: " WNAME);
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect (GTK_OBJECT (dlg), "realize",
-                            GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL);
-#else
-        g_signal_connect(G_OBJECT(dlg), "realize",
-                         G_CALLBACK(window_icon_realize_cb), NULL);
-#endif
+	SIGNAL_CONNECT(dlg, "realize", window_icon_realize_cb, NULL);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_border_width(GTK_CONTAINER(vbox), 5);
@@ -317,15 +312,10 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
 	/* Close button */
 #if GTK_MAJOR_VERSION < 2
 	bt = gtk_button_new_with_label("Close");
-	gtk_signal_connect_object(GTK_OBJECT(bt), "clicked",
-                                  GTK_SIGNAL_FUNC(gtk_widget_destroy),
-                                  GTK_OBJECT(dlg));
 #else
         bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	g_signal_connect_swapped(G_OBJECT(bt), "clicked",
-                                 G_CALLBACK(gtk_widget_destroy),
-                                 G_OBJECT(dlg));
 #endif
+	SIGNAL_CONNECT_OBJECT(bt, "clicked", gtk_widget_destroy, dlg);
 	gtk_container_add(GTK_CONTAINER(bbox), bt);
 	GTK_WIDGET_SET_FLAGS(bt, GTK_CAN_DEFAULT);
 	gtk_widget_grab_default(bt);
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index 81fd4691b3..dc1c726233 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -1,7 +1,7 @@
 /* rpc_progs.c
  * rpc_progs   2002 Ronnie Sahlberg
  *
- * $Id: rpc_progs.c,v 1.4 2002/11/06 10:53:36 sahlberg Exp $
+ * $Id: rpc_progs.c,v 1.5 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -39,6 +39,7 @@
 #include "rpc_progs.h"
 #include "packet-rpc.h"
 #include "../globals.h"
+#include "compat_macros.h"
 
 static GtkWidget *win=NULL;
 static GtkWidget *table=NULL;
@@ -302,7 +303,7 @@ win_destroy_cb(void *dummy _U_, gpointer data _U_)
 
 /* When called, this function will start rpcprogs
  */
-static void
+void
 gtk_rpcprogs_init(char *optarg _U_)
 {
 	char title_string[60];
@@ -318,7 +319,7 @@ gtk_rpcprogs_init(char *optarg _U_)
 	win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	sprintf(title_string,"ONC-RPC Program Statistics");
 	gtk_window_set_title(GTK_WINDOW(win), title_string);
-	gtk_signal_connect(GTK_OBJECT(win), "destroy", GTK_SIGNAL_FUNC(win_destroy_cb), win);
+	SIGNAL_CONNECT(win, "destroy", win_destroy_cb, win);
 
 	vbox=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(win), vbox);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index b91ea14c13..0b08f33466 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.5 2002/11/06 10:53:36 sahlberg Exp $
+ * $Id: rpc_stat.c,v 1.6 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -40,6 +40,7 @@
 #include "rpc_stat.h"
 #include "packet-rpc.h"
 #include "../globals.h"
+#include "compat_macros.h"
 
 /* used to keep track of statistics for a specific procedure */
 typedef struct _rpc_procedure_t {
@@ -305,7 +306,7 @@ gtk_rpcstat_init(char *optarg)
 	rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	sprintf(title_string,"ONC-RPC RTT Stat for %s version %d", rs->prog, rs->version);
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
-	gtk_signal_connect(GTK_OBJECT(rs->win), "destroy", GTK_SIGNAL_FUNC(win_destroy_cb), rs);
+	SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
 
 	vbox=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(rs->win), vbox);
@@ -471,8 +472,8 @@ rpcstat_program_select(GtkWidget *item _U_, gpointer key)
 		char vs[5];
 		sprintf(vs,"%d",i);
 		menu_item=gtk_menu_item_new_with_label(vs);
-		gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-				GTK_SIGNAL_FUNC(rpcstat_version_select), (gpointer)i);
+		SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select,
+                               i);
 
 		gtk_widget_show(menu_item);
 		gtk_menu_append(GTK_MENU(vers_menu), menu_item);
@@ -488,8 +489,7 @@ rpcstat_list_programs(gpointer *key, gpointer *value, gpointer *user_data _U_)
 	GtkWidget *menu_item;
 
 	menu_item=gtk_menu_item_new_with_label(v->progname);
-	gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-			GTK_SIGNAL_FUNC(rpcstat_program_select), (gpointer)k);
+	SIGNAL_CONNECT(menu_item, "activate", rpcstat_program_select, k);
 
 	gtk_widget_show(menu_item);
 	gtk_menu_append(GTK_MENU(prog_menu), menu_item);
@@ -520,7 +520,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(dlg), "ONC-RPC RTT Statistics");
-	gtk_signal_connect(GTK_OBJECT(dlg), "destroy", GTK_SIGNAL_FUNC(dlg_destroy_cb), NULL);
+	SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 	dlg_box=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(dlg), dlg_box);
 	gtk_widget_show(dlg_box);
@@ -559,8 +559,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 		char vs[5];
 		sprintf(vs,"%d",i);
 		menu_item=gtk_menu_item_new_with_label(vs);
-		gtk_signal_connect(GTK_OBJECT(menu_item), "activate", 
-				GTK_SIGNAL_FUNC(rpcstat_version_select), (gpointer)i);
+		SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select,
+                               i);
 
 		gtk_widget_show(menu_item);
 		gtk_menu_append(GTK_MENU(vers_menu), menu_item);
@@ -592,9 +592,8 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	/* the start button */
 	start_button=gtk_button_new_with_label("Create Stat");
-	gtk_signal_connect_object(GTK_OBJECT(start_button), "clicked", 
-			GTK_SIGNAL_FUNC(rpcstat_start_button_clicked),
-			NULL);
+        SIGNAL_CONNECT_OBJECT(start_button, "clicked",
+                              rpcstat_start_button_clicked, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), start_button, TRUE, TRUE, 0);
 	gtk_widget_show(start_button);
 
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 1c3b11762a..1dde9f2d55 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,7 +1,7 @@
 /* simple_dialog.c
  * Simple message dialog box routines.
  *
- * $Id: simple_dialog.c,v 1.13 2002/11/03 17:38:34 oabad Exp $
+ * $Id: simple_dialog.c,v 1.14 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -38,6 +38,7 @@
 #include "gtkglobals.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
+#include "compat_macros.h"
 
 #include "image/eexcl3d64.xpm"
 #include "image/eicon3d64.xpm"
@@ -94,7 +95,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
 
   gtk_container_border_width(GTK_CONTAINER(win), 7);
 
-  gtk_object_set_data(GTK_OBJECT(win), bm_key, btn_mask);
+  OBJECT_SET_DATA(win, bm_key, btn_mask);
 
   /* Container for our rows */
   main_vb = gtk_vbox_new(FALSE, 5);
@@ -134,14 +135,10 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
 
 #if GTK_MAJOR_VERSION < 2
   ok_btn = gtk_button_new_with_label ("OK");
-  gtk_signal_connect_object(GTK_OBJECT(ok_btn), "clicked",
-                            GTK_SIGNAL_FUNC(gtk_widget_destroy),
-                            GTK_OBJECT(win));
 #else
   ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
-  g_signal_connect_swapped(G_OBJECT(ok_btn), "clicked",
-                           G_CALLBACK(gtk_widget_destroy), G_OBJECT (win));
 #endif
+  SIGNAL_CONNECT_OBJECT(ok_btn, "clicked", gtk_widget_destroy, win);
   gtk_container_add(GTK_CONTAINER(bbox), ok_btn);
   GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT);
   gtk_widget_grab_default(ok_btn);
@@ -150,13 +147,10 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
   if (btn_mask && *btn_mask == ESD_BTN_CANCEL) {
 #if GTK_MAJOR_VERSION < 2
     cancel_btn = gtk_button_new_with_label("Cancel");
-    gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                       GTK_SIGNAL_FUNC(simple_dialog_cancel_cb), (gpointer)win);
 #else
     cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-    g_signal_connect(G_OBJECT(cancel_btn), "clicked",
-                     G_CALLBACK(simple_dialog_cancel_cb), (gpointer)win);
 #endif
+    SIGNAL_CONNECT(cancel_btn, "clicked", simple_dialog_cancel_cb, win);
     gtk_container_add(GTK_CONTAINER(bbox), cancel_btn);
     GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
     gtk_widget_show(cancel_btn);
@@ -180,7 +174,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
 
 static void
 simple_dialog_cancel_cb(GtkWidget *w _U_, gpointer win) {
-  gint *btn_mask = (gint *) gtk_object_get_data(win, bm_key);
+  gint *btn_mask = (gint *) OBJECT_GET_DATA(win, bm_key);
 
   if (btn_mask)
     *btn_mask = ESD_BTN_CANCEL;
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index 1bdec39acc..bbc5d11a52 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -1,7 +1,7 @@
 /* stream_prefs.c
  * Dialog boxes for preferences for the stream window
  *
- * $Id: stream_prefs.c,v 1.14 2002/11/03 17:38:34 oabad Exp $
+ * $Id: stream_prefs.c,v 1.15 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,6 +35,7 @@
 #include "keys.h"
 #include "print.h"
 #include "prefs.h"
+#include "compat_macros.h"
 
 static void update_text_color(GtkWidget *, gpointer);
 static void update_current_color(GtkWidget *, gpointer);
@@ -106,16 +107,8 @@ stream_prefs_show()
   menu = gtk_menu_new ();
   for (i = 0; i < mcount; i++){
     menuitem = gtk_menu_item_new_with_label (mt[i]);
-#if GTK_MAJOR_VERSION < 2
-    gtk_object_set_data(GTK_OBJECT(menuitem), STREAM_CS_KEY,
-                        (gpointer) colorsel);
-    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                       GTK_SIGNAL_FUNC(update_current_color), &tcolors[i]);
-#else
-    g_object_set_data(G_OBJECT(menuitem), STREAM_CS_KEY, (gpointer)colorsel);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(update_current_color), &tcolors[i]);
-#endif
+    OBJECT_SET_DATA(menuitem, STREAM_CS_KEY, colorsel);
+    SIGNAL_CONNECT(menuitem, "activate", update_current_color, &tcolors[i]);
     gtk_widget_show (menuitem);
     gtk_menu_append (GTK_MENU (menu), menuitem);
   }
@@ -127,7 +120,7 @@ stream_prefs_show()
   sample = gtk_text_new(FALSE, FALSE);
   height = 2 * (sample->style->font->ascent + sample->style->font->descent);
   width = gdk_string_width(sample->style->font, "Sample server text");
-  gtk_widget_set_usize(GTK_WIDGET(sample), width, height);
+  WIDGET_SET_SIZE(sample, width, height);
   gtk_text_set_editable(GTK_TEXT(sample), FALSE);
   gtk_text_insert(GTK_TEXT(sample), NULL, &tcolors[CFG_IDX], &tcolors[CBG_IDX],
                   SAMPLE_CLIENT_TEXT, -1);
@@ -139,7 +132,7 @@ stream_prefs_show()
                 gtk_style_get_font(sample->style)->descent);
   width = gdk_string_width(gtk_style_get_font(sample->style),
                            "Sample server text");
-  gtk_widget_set_size_request(GTK_WIDGET(sample), width, height);
+  WIDGET_SET_SIZE(sample, width, height);
   gtk_text_view_set_editable(GTK_TEXT_VIEW(sample), FALSE);
   buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(sample));
   gtk_text_buffer_get_start_iter(buf, &iter);
@@ -166,16 +159,8 @@ stream_prefs_show()
   gtk_table_attach(GTK_TABLE(main_tb), colorsel, 0, 3, 2, 3,
 		  GTK_SHRINK, GTK_SHRINK, 0, 0);
 
-#if GTK_MAJOR_VERSION < 2
-  gtk_object_set_data(GTK_OBJECT(colorsel), STREAM_SAMPLE_KEY,
-                      (gpointer)sample);
-  gtk_signal_connect(GTK_OBJECT(colorsel), "color-changed",
-                     GTK_SIGNAL_FUNC(update_text_color), NULL);
-#else
-  g_object_set_data(G_OBJECT(colorsel), STREAM_SAMPLE_KEY, (gpointer)sample);
-  g_signal_connect(G_OBJECT(colorsel), "color-changed",
-                   G_CALLBACK(update_text_color), NULL);
-#endif
+  OBJECT_SET_DATA(colorsel, STREAM_SAMPLE_KEY, sample);
+  SIGNAL_CONNECT(colorsel, "color-changed", update_text_color, NULL);
   gtk_widget_show(colorsel);
 
   gtk_widget_show(main_vb);
@@ -185,10 +170,10 @@ stream_prefs_show()
 static void
 update_text_color(GtkWidget *w, gpointer data _U_) {
 #if GTK_MAJOR_VERSION < 2
-  GtkText  *sample   = gtk_object_get_data(GTK_OBJECT(w), STREAM_SAMPLE_KEY);
+  GtkText  *sample   = OBJECT_GET_DATA(w, STREAM_SAMPLE_KEY);
   gdouble   scolor[4];
 #else
-  GtkTextView *sample = gtk_object_get_data(GTK_OBJECT(w), STREAM_SAMPLE_KEY);
+  GtkTextView *sample = OBJECT_GET_DATA(w, STREAM_SAMPLE_KEY);
   GtkTextBuffer *buf;
   GtkTextTag    *tag;
 #endif
@@ -229,8 +214,7 @@ update_current_color(GtkWidget *w, gpointer data)
   gdouble            scolor[4];
 #endif
 
-  colorsel = GTK_COLOR_SELECTION(gtk_object_get_data(GTK_OBJECT(w),
-                                                     STREAM_CS_KEY));
+  colorsel = GTK_COLOR_SELECTION(OBJECT_GET_DATA(w, STREAM_CS_KEY));
   curcolor = (GdkColor *) data;
 
 #if GTK_MAJOR_VERSION < 2
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index 11c36a03f9..39f62a86c1 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
 /* summary_dlg.c
  * Routines for capture file summary window
  *
- * $Id: summary_dlg.c,v 1.16 2002/11/03 17:38:34 oabad Exp $
+ * $Id: summary_dlg.c,v 1.17 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -40,6 +40,7 @@
 #include "summary_dlg.h"
 #include "dlg_utils.h"
 #include "ui_util.h"
+#include "compat_macros.h"
 
 #define SUM_STR_MAX 1024
 
@@ -74,13 +75,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
   seconds = summary.stop_time - summary.start_time;
   sum_open_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(sum_open_w), "Ethereal: Summary");
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(sum_open_w), "realize",
-                     GTK_SIGNAL_FUNC(window_icon_realize_cb), NULL);
-#else
-  g_signal_connect(G_OBJECT(sum_open_w), "realize",
-                   G_CALLBACK(window_icon_realize_cb), NULL);
-#endif
+  SIGNAL_CONNECT(sum_open_w, "realize", window_icon_realize_cb, NULL);
 
   /* Container for each row of widgets */
   main_vb = gtk_vbox_new(FALSE, 3);
@@ -217,15 +212,10 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
   /* Create Close Button */
 #if GTK_MAJOR_VERSION < 2
   close_bt = gtk_button_new_with_label("Close");
-  gtk_signal_connect_object(GTK_OBJECT(close_bt), "clicked",
-                            GTK_SIGNAL_FUNC(gtk_widget_destroy),
-                            GTK_OBJECT(sum_open_w));
 #else
   close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-  g_signal_connect_swapped(G_OBJECT(close_bt), "clicked",
-                           G_CALLBACK(gtk_widget_destroy),
-                           G_OBJECT(sum_open_w));
 #endif
+  SIGNAL_CONNECT_OBJECT(close_bt, "clicked", gtk_widget_destroy, sum_open_w);
   GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX(bbox), close_bt, FALSE,FALSE, 0);
   gtk_widget_grab_default(close_bt);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 70ce7cd786..4ba48c7198 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
  * By Pavel Mores <pvl@uh.cz>
  * Win32 port:  rwh@unifiedtech.com
  *
- * $Id: tcp_graph.c,v 1.23 2002/11/03 17:38:34 oabad Exp $
+ * $Id: tcp_graph.c,v 1.24 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -44,6 +44,7 @@
 #include "simple_dialog.h"
 #include "ui_util.h"
 #include "tcp_graph.h"
+#include "compat_macros.h"
 
 /* from <net/ethernet.h> */
 struct ether_header {
@@ -579,15 +580,9 @@ static void create_text_widget (struct graph *g)
 	debug(DBS_FENTRY) puts ("create_text_widget()");
 	streamwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_name (streamwindow, "Packet chain");
-#if GTK_MAJOR_VERSION < 2
-	gtk_widget_set_usize(GTK_WIDGET(streamwindow), TXT_WIDTH, TXT_HEIGHT);
-#else
-	gtk_widget_set_size_request(GTK_WIDGET(streamwindow), TXT_WIDTH,
-                                    TXT_HEIGHT);
-#endif
+	WIDGET_SET_SIZE(streamwindow, TXT_WIDTH, TXT_HEIGHT);
 	gtk_container_border_width (GTK_CONTAINER(streamwindow), 2);
-	gtk_signal_connect (GTK_OBJECT (streamwindow), "realize",
-		GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL);
+	SIGNAL_CONNECT(streamwindow, "realize", window_icon_realize_cb, NULL);
 
 	box = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (streamwindow), box);
@@ -701,13 +696,7 @@ static void create_drawing_area (struct graph *g)
 #endif
 	g->toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_name (g->toplevel, "Test Graph");
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(g->toplevel), "realize",
-                           GTK_SIGNAL_FUNC(window_icon_realize_cb), NULL);
-#else
-	g_signal_connect(G_OBJECT(g->toplevel), "realize",
-                         G_CALLBACK(window_icon_realize_cb), NULL);
-#endif
+	SIGNAL_CONNECT(g->toplevel, "realize", window_icon_realize_cb, NULL);
 
 	/* Create the drawing area */
 	g->drawing_area = gtk_drawing_area_new ();
@@ -717,57 +706,27 @@ static void create_drawing_area (struct graph *g)
 					g->wp.height + g->wp.y + g->x_axis->s.height);
 	gtk_widget_show (g->drawing_area);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(g->drawing_area), "expose_event",
-                           (GtkSignalFunc)expose_event, NULL);
+	SIGNAL_CONNECT(g->drawing_area, "expose_event", expose_event, NULL);
 	/* this has to be done later, after the widget has been shown */
 	/*
-	gtk_signal_connect (GTK_OBJECT(g->drawing_area),"configure_event",
-							(GtkSignalFunc )configure_event, NULL);
+	SIGNAL_CONNECT(g->drawing_area,"configure_event", configure_event,
+        NULL);
 	 */
-	gtk_signal_connect(GTK_OBJECT (g->drawing_area), "motion_notify_event",
-                           (GtkSignalFunc )motion_notify_event, NULL);
-	gtk_signal_connect(GTK_OBJECT (g->drawing_area), "button_press_event",
-                           (GtkSignalFunc )button_press_event, NULL);
-	gtk_signal_connect(GTK_OBJECT (g->drawing_area), "button_release_event",
-                           (GtkSignalFunc )button_release_event, NULL);
-	gtk_signal_connect(GTK_OBJECT (g->drawing_area), "leave_notify_event",
-                           (GtkSignalFunc )leave_notify_event, NULL);
-	gtk_signal_connect(GTK_OBJECT (g->drawing_area), "enter_notify_event",
-                           (GtkSignalFunc )enter_notify_event, NULL);
-	gtk_signal_connect(GTK_OBJECT (g->toplevel), "destroy",
-                           (GtkSignalFunc )callback_toplevel_destroy, g);
+	SIGNAL_CONNECT(g->drawing_area, "motion_notify_event",
+                       motion_notify_event, NULL);
+	SIGNAL_CONNECT(g->drawing_area, "button_press_event",
+                       button_press_event, NULL);
+	SIGNAL_CONNECT(g->drawing_area, "button_release_event",
+                       button_release_event, NULL);
+	SIGNAL_CONNECT(g->drawing_area, "leave_notify_event",
+                       leave_notify_event, NULL);
+	SIGNAL_CONNECT(g->drawing_area, "enter_notify_event",
+                       enter_notify_event, NULL);
+	SIGNAL_CONNECT(g->toplevel, "destroy", callback_toplevel_destroy, g);
 	/* why doesn't drawing area send key_press_signals? */
-	gtk_signal_connect(GTK_OBJECT (g->toplevel), "key_press_event",
-                           (GtkSignalFunc )key_press_event, NULL);
-	gtk_signal_connect(GTK_OBJECT (g->toplevel), "key_release_event",
-                           (GtkSignalFunc )key_release_event, NULL);
-#else
-	g_signal_connect(G_OBJECT(g->drawing_area), "expose_event",
-                         G_CALLBACK(expose_event), NULL);
-        /* this has to be done later, after the widget has been shown */
-	/*
-	gtk_signal_connect (GTK_OBJECT(g->drawing_area),"configure_event",
-							(GtkSignalFunc )configure_event, NULL);
-	 */
-	g_signal_connect(G_OBJECT(g->drawing_area), "motion_notify_event",
-                         G_CALLBACK(motion_notify_event), NULL);
-	g_signal_connect(G_OBJECT(g->drawing_area), "button_press_event",
-                    	 G_CALLBACK(button_press_event), NULL);
-	g_signal_connect(G_OBJECT(g->drawing_area), "button_release_event",
-                    	 G_CALLBACK(button_release_event), NULL);
-	g_signal_connect(G_OBJECT(g->drawing_area), "leave_notify_event",
-                    	 G_CALLBACK(leave_notify_event), NULL);
-	g_signal_connect(G_OBJECT(g->drawing_area), "enter_notify_event",
-                    	 G_CALLBACK(enter_notify_event), NULL);
-	g_signal_connect(G_OBJECT(g->toplevel), "destroy",
-                    	 G_CALLBACK(callback_toplevel_destroy), g);
-	/* why doesn't drawing area send key_press_signals? */
-	g_signal_connect(G_OBJECT(g->toplevel), "key_press_event",
-                    	 G_CALLBACK(key_press_event), NULL);
-	g_signal_connect(G_OBJECT(g->toplevel), "key_release_event",
-                    	 G_CALLBACK(key_release_event), NULL);
-#endif
+	SIGNAL_CONNECT(g->toplevel, "key_press_event", key_press_event, NULL);
+	SIGNAL_CONNECT(g->toplevel, "key_release_event", key_release_event,
+                       NULL);
 	gtk_widget_set_events(g->toplevel,
                               GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
 
@@ -840,13 +799,8 @@ static void create_drawing_area (struct graph *g)
 	 * !!! NEMĚLO BY TO BÝT NA KONCI graph_init_sequence()? !!!
 	 *
 	 */
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(g->drawing_area),"configure_event",
-                           (GtkSignalFunc )configure_event, NULL);
-#else
-	g_signal_connect(G_OBJECT(g->drawing_area),"configure_event",
-                         G_CALLBACK(configure_event), NULL);
-#endif
+	SIGNAL_CONNECT(g->drawing_area,"configure_event", configure_event,
+                       NULL);
 
 	/* puts ("exiting create_drawing_area()"); */
 }
@@ -891,13 +845,7 @@ static void control_panel_create (struct graph *g)
 	gtk_box_pack_start (GTK_BOX (button_box), close, TRUE, TRUE, 0);
 
 	toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(toplevel), "realize",
-                           GTK_SIGNAL_FUNC(window_icon_realize_cb), NULL);
-#else
-	g_signal_connect(G_OBJECT(toplevel), "realize",
-                         G_CALLBACK(window_icon_realize_cb), NULL);
-#endif
+	SIGNAL_CONNECT(toplevel, "realize", window_icon_realize_cb, NULL);
 
 	table = gtk_table_new (2, 1,  FALSE);
 	gtk_container_add (GTK_CONTAINER (toplevel), table);
@@ -907,17 +855,8 @@ static void control_panel_create (struct graph *g)
 	gtk_table_attach (GTK_TABLE (table), button_box, 0, 1, 1, 2,
                           GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(close), "clicked",
-                           (GtkSignalFunc)callback_close, g);
-	gtk_signal_connect(GTK_OBJECT(help), "clicked",
-                           (GtkSignalFunc)callback_create_help, g);
-#else
-        g_signal_connect(G_OBJECT(close), "clicked",
-                         G_CALLBACK(callback_close), g);
-	g_signal_connect(GTK_OBJECT(help), "clicked",
-                         G_CALLBACK(callback_create_help), g);
-#endif
+	SIGNAL_CONNECT(close, "clicked", callback_close, g);
+	SIGNAL_CONNECT(help, "clicked", callback_create_help, g);
 
 	/* gtk_widget_show_all (table); */
 	/* g->gui.control_panel = table; */
@@ -993,17 +932,8 @@ static void control_panel_add_origin_page (struct graph *g, GtkWidget *n)
 	g->gui.time_orig_conn = (GtkToggleButton * )time_orig_conn;
 	g->gui.seq_orig_isn = (GtkToggleButton * )seq_orig_isn;
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(time_orig_conn), "toggled",
-                           (GtkSignalFunc)callback_time_origin, g);
-	gtk_signal_connect(GTK_OBJECT(seq_orig_isn), "toggled",
-                           (GtkSignalFunc)callback_seq_origin, g);
-#else
-        g_signal_connect(G_OBJECT(time_orig_conn), "toggled",
-                         G_CALLBACK(callback_time_origin), g);
-	g_signal_connect(G_OBJECT(seq_orig_isn), "toggled",
-                         G_CALLBACK(callback_seq_origin), g);
-#endif
+	SIGNAL_CONNECT(time_orig_conn, "toggled", callback_time_origin, g);
+	SIGNAL_CONNECT(seq_orig_isn, "toggled", callback_seq_origin, g);
 
 	box = gtk_vbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (box), 5);
@@ -1055,15 +985,8 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data)
 
 	toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(toplevel), "Help for TCP graphing");
-#if GTK_MAJOR_VERSION < 2
-	gtk_widget_set_usize (toplevel, 500, 400);
-	gtk_signal_connect(GTK_OBJECT(toplevel), "realize",
-                           GTK_SIGNAL_FUNC(window_icon_realize_cb), NULL);
-#else
-        gtk_widget_set_size_request(toplevel, 500, 400);
-	g_signal_connect(G_OBJECT(toplevel), "realize",
-                         G_CALLBACK(window_icon_realize_cb), NULL);
-#endif
+	WIDGET_SET_SIZE(toplevel, 500, 400);
+	SIGNAL_CONNECT(toplevel, "realize", window_icon_realize_cb, NULL);
 
 	box = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (toplevel), box);
@@ -1087,14 +1010,11 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data)
 #if GTK_MAJOR_VERSION < 2
 	close = gtk_button_new_with_label ("Close");
 	gtk_box_pack_start (GTK_BOX (box), close, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(close), "clicked",
-                           (GtkSignalFunc)callback_close_help, toplevel);
 #else
         close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 	gtk_box_pack_start (GTK_BOX (box), close, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(close), "clicked",
-                         G_CALLBACK(callback_close_help), toplevel);
 #endif
+	SIGNAL_CONNECT(close, "clicked", callback_close_help, toplevel);
 
 	gtk_widget_show_all (toplevel);
 }
@@ -1175,25 +1095,11 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g)
 
 	zoom_same_toggle = gtk_check_button_new_with_label("Keep them the same");
 	zoom_ratio_toggle = gtk_check_button_new_with_label("Preserve their ratio");
-#if GTK_MAJOR_VERSION < 2
-	gtk_object_set_data(GTK_OBJECT(zoom_same_toggle), "flag",
-                            (gpointer)ZOOM_STEPS_SAME);
-	gtk_object_set_data(GTK_OBJECT(zoom_ratio_toggle), "flag",
-                            (gpointer)ZOOM_STEPS_KEEP_RATIO);
-	gtk_signal_connect(GTK_OBJECT(zoom_same_toggle), "clicked",
-                           (GtkSignalFunc)callback_zoom_flags, g);
-	gtk_signal_connect(GTK_OBJECT(zoom_ratio_toggle), "clicked",
-                           (GtkSignalFunc)callback_zoom_flags, g);
-#else
-        g_object_set_data(G_OBJECT(zoom_same_toggle), "flag",
-                          (gpointer)ZOOM_STEPS_SAME);
-	g_object_set_data(G_OBJECT(zoom_ratio_toggle), "flag",
-                          (gpointer)ZOOM_STEPS_KEEP_RATIO);
-	g_signal_connect(G_OBJECT(zoom_same_toggle), "clicked",
-                         G_CALLBACK(callback_zoom_flags), g);
-	g_signal_connect(G_OBJECT(zoom_ratio_toggle), "clicked",
-                         G_CALLBACK(callback_zoom_flags), g);
-#endif
+	OBJECT_SET_DATA(zoom_same_toggle, "flag", (gpointer)ZOOM_STEPS_SAME);
+	OBJECT_SET_DATA(zoom_ratio_toggle, "flag",
+                        (gpointer)ZOOM_STEPS_KEEP_RATIO);
+	SIGNAL_CONNECT(zoom_same_toggle, "clicked", callback_zoom_flags, g);
+	SIGNAL_CONNECT(zoom_ratio_toggle, "clicked", callback_zoom_flags, g);
 
 	zoom_step_table = gtk_table_new (4, 2,  FALSE);
 	gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_h_step_label, 0,1,0,1,
@@ -1218,27 +1124,12 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g)
 	zoom_frame = gtk_frame_new ("Zoom");
 	gtk_container_add (GTK_CONTAINER (zoom_frame), zoom_box);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_object_set_data(GTK_OBJECT(zoom_h_step), "direction", (gpointer)0);
-	gtk_object_set_data(GTK_OBJECT(zoom_v_step), "direction", (gpointer)1);
-
-	gtk_signal_connect(GTK_OBJECT(zoom_in), "toggled",
-                           (GtkSignalFunc)callback_zoom_inout, g);
-	gtk_signal_connect(GTK_OBJECT(zoom_h_step), "changed",
-                           (GtkSignalFunc)callback_zoom_step, g);
-        gtk_signal_connect(GTK_OBJECT(zoom_v_step), "changed",
-                           (GtkSignalFunc)callback_zoom_step, g);
-#else
-        g_object_set_data(G_OBJECT(zoom_h_step), "direction", (gpointer)0);
-	g_object_set_data(G_OBJECT(zoom_v_step), "direction", (gpointer)1);
-
-	g_signal_connect(G_OBJECT(zoom_in), "toggled",
-                         G_CALLBACK(callback_zoom_inout), g);
-	g_signal_connect(G_OBJECT(zoom_h_step), "changed",
-                         G_CALLBACK(callback_zoom_step), g);
-	g_signal_connect(G_OBJECT(zoom_v_step), "changed",
-                         G_CALLBACK(callback_zoom_step), g);
-#endif
+	OBJECT_SET_DATA(zoom_h_step, "direction", GINT_TO_POINTER(0));
+	OBJECT_SET_DATA(zoom_v_step, "direction", GINT_TO_POINTER(1));
+
+	SIGNAL_CONNECT(zoom_in, "toggled", callback_zoom_inout, g);
+	SIGNAL_CONNECT(zoom_h_step, "changed", callback_zoom_step, g);
+        SIGNAL_CONNECT(zoom_v_step, "changed", callback_zoom_step, g);
 
 	g->zoom.widget.in_toggle = (GtkToggleButton * )zoom_in;
 	g->zoom.widget.out_toggle = (GtkToggleButton * )zoom_out;
@@ -1264,7 +1155,7 @@ static void callback_zoom_step (GtkWidget *spin, gpointer data)
 	GtkSpinButton *widget_this, *widget_other;
 	double old_this;
 
-	direction = (int )gtk_object_get_data (GTK_OBJECT (spin), "direction");
+	direction = (int)OBJECT_GET_DATA(spin, "direction");
 	value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (spin));
 
 	if (direction) {
@@ -1303,7 +1194,7 @@ static void callback_zoom_step (GtkWidget *spin, gpointer data)
 static void callback_zoom_flags (GtkWidget *toggle, gpointer data)
 {
 	struct graph *g = (struct graph * )data;
-	int flag = (int )gtk_object_get_data (GTK_OBJECT (toggle), "flag");
+	int flag = (int)OBJECT_GET_DATA(toggle, "flag");
 
 	if (GTK_TOGGLE_BUTTON (toggle)->active)
 		g->zoom.flags |= flag;
@@ -1406,55 +1297,19 @@ static GtkWidget *control_panel_create_magnify_group (struct graph *g)
 
 	g->magnify.widget.h_zoom = (GtkSpinButton * )mag_h_zoom;
 	g->magnify.widget.v_zoom = (GtkSpinButton * )mag_v_zoom;
-#if GTK_MAJOR_VERSION < 2
-	gtk_object_set_data(GTK_OBJECT(mag_h_zoom), "direction", (gpointer)0);
-	gtk_object_set_data(GTK_OBJECT(mag_v_zoom), "direction", (gpointer)1);
-	gtk_object_set_data(GTK_OBJECT(mag_zoom_same), "flag",
-                            (gpointer)MAGZOOMS_SAME);
-	gtk_object_set_data(GTK_OBJECT(mag_zoom_ratio), "flag",
-                            (gpointer)MAGZOOMS_SAME_RATIO);
-
-	gtk_signal_connect(GTK_OBJECT(mag_width), "changed",
-                           (GtkSignalFunc)callback_mag_width, g);
-	gtk_signal_connect(GTK_OBJECT(mag_height), "changed",
-                           (GtkSignalFunc)callback_mag_height, g);
-	gtk_signal_connect(GTK_OBJECT(mag_x), "changed",
-                           (GtkSignalFunc)callback_mag_x, g);
-	gtk_signal_connect(GTK_OBJECT(mag_y), "changed",
-                           (GtkSignalFunc)callback_mag_y, g);
-	gtk_signal_connect(GTK_OBJECT(mag_h_zoom), "changed",
-                           (GtkSignalFunc)callback_mag_zoom, g);
-	gtk_signal_connect(GTK_OBJECT(mag_v_zoom), "changed",
-                           (GtkSignalFunc)callback_mag_zoom, g);
-	gtk_signal_connect(GTK_OBJECT(mag_zoom_same), "clicked",
-                           (GtkSignalFunc)callback_mag_flags, g);
-	gtk_signal_connect(GTK_OBJECT(mag_zoom_ratio), "clicked",
-                           (GtkSignalFunc)callback_mag_flags, g);
-#else
-	g_object_set_data(G_OBJECT(mag_h_zoom), "direction", (gpointer)0);
-	g_object_set_data(G_OBJECT(mag_v_zoom), "direction", (gpointer)1);
-	g_object_set_data(G_OBJECT(mag_zoom_same), "flag",
-                          (gpointer)MAGZOOMS_SAME);
-	g_object_set_data(G_OBJECT(mag_zoom_ratio), "flag",
-                          (gpointer)MAGZOOMS_SAME_RATIO);
-
-        g_signal_connect(G_OBJECT(mag_width), "changed",
-                         G_CALLBACK(callback_mag_width), g);
-	g_signal_connect(G_OBJECT(mag_height), "changed",
-                         G_CALLBACK(callback_mag_height), g);
-	g_signal_connect(G_OBJECT(mag_x), "changed",
-                         G_CALLBACK(callback_mag_x), g);
-	g_signal_connect(G_OBJECT(mag_y), "changed",
-                         G_CALLBACK(callback_mag_y), g);
-	g_signal_connect(G_OBJECT(mag_h_zoom), "changed",
-                         G_CALLBACK(callback_mag_zoom), g);
-	g_signal_connect(G_OBJECT(mag_v_zoom), "changed",
-                         G_CALLBACK(callback_mag_zoom), g);
-	g_signal_connect(G_OBJECT(mag_zoom_same), "clicked",
-                         G_CALLBACK(callback_mag_flags), g);
-	g_signal_connect(G_OBJECT(mag_zoom_ratio), "clicked",
-                         G_CALLBACK(callback_mag_flags), g);
-#endif
+	OBJECT_SET_DATA(mag_h_zoom, "direction", GINT_TO_POINTER(0));
+	OBJECT_SET_DATA(mag_v_zoom, "direction", GINT_TO_POINTER(1));
+	OBJECT_SET_DATA(mag_zoom_same, "flag", (gpointer)MAGZOOMS_SAME);
+	OBJECT_SET_DATA(mag_zoom_ratio, "flag", (gpointer)MAGZOOMS_SAME_RATIO);
+
+	SIGNAL_CONNECT(mag_width, "changed", callback_mag_width, g);
+	SIGNAL_CONNECT(mag_height, "changed", callback_mag_height, g);
+	SIGNAL_CONNECT(mag_x, "changed", callback_mag_x, g);
+	SIGNAL_CONNECT(mag_y, "changed", callback_mag_y, g);
+	SIGNAL_CONNECT(mag_h_zoom, "changed", callback_mag_zoom, g);
+	SIGNAL_CONNECT(mag_v_zoom, "changed", callback_mag_zoom, g);
+	SIGNAL_CONNECT(mag_zoom_same, "clicked", callback_mag_flags, g);
+	SIGNAL_CONNECT(mag_zoom_ratio, "clicked", callback_mag_flags, g);
 
 	return mag_frame;
 }
@@ -1501,7 +1356,7 @@ static void callback_mag_zoom (GtkWidget *spin, gpointer data)
 		g->magnify.flags &= ~MAGZOOMS_IGNORE;
 		return;
 	}
-	direction = (int )gtk_object_get_data (GTK_OBJECT (spin), "direction");
+	direction = (int)OBJECT_GET_DATA(spin, "direction");
 	value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (spin));
 
 	if (direction) {
@@ -1544,7 +1399,7 @@ static void callback_mag_zoom (GtkWidget *spin, gpointer data)
 static void callback_mag_flags (GtkWidget *toggle, gpointer data)
 {
 	struct graph *g = (struct graph * )data;
-	int flag = (int )gtk_object_get_data (GTK_OBJECT (toggle), "flag");
+	int flag = (int)OBJECT_GET_DATA(toggle, "flag");
 
 	if (GTK_TOGGLE_BUTTON (toggle)->active)
 		g->magnify.flags |= flag;
@@ -1573,17 +1428,8 @@ static GtkWidget *control_panel_create_zoomlock_group (struct graph *g)
 	zoom_lock_frame = gtk_frame_new ("Zoom lock:");
 	gtk_container_add (GTK_CONTAINER (zoom_lock_frame), zoom_lock_box);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(zoom_lock_h), "toggled",
-                           (GtkSignalFunc)callback_zoomlock_h, g);
-	gtk_signal_connect(GTK_OBJECT(zoom_lock_v), "toggled",
-                           (GtkSignalFunc)callback_zoomlock_v, g);
-#else
-        g_signal_connect(G_OBJECT(zoom_lock_h), "toggled",
-                         G_CALLBACK(callback_zoomlock_h), g);
-	g_signal_connect(G_OBJECT(zoom_lock_v), "toggled",
-                         G_CALLBACK(callback_zoomlock_v), g);
-#endif
+	SIGNAL_CONNECT(zoom_lock_h, "toggled", callback_zoomlock_h, g);
+	SIGNAL_CONNECT(zoom_lock_v, "toggled", callback_zoomlock_v, g);
 
 	return zoom_lock_frame;
 }
@@ -1627,13 +1473,7 @@ static GtkWidget *control_panel_create_cross_group (struct graph *g)
 	frame = gtk_frame_new (NULL);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(on), "toggled",
-                           (GtkSignalFunc)callback_cross_on_off, g);
-#else
-        g_signal_connect(G_OBJECT(on), "toggled",
-                         G_CALLBACK(callback_cross_on_off), g);
-#endif
+	SIGNAL_CONNECT(on, "toggled", callback_cross_on_off, g);
 
 	g->cross.on_toggle = (GtkToggleButton * )on;
 	g->cross.off_toggle = (GtkToggleButton * )off;
@@ -1698,47 +1538,18 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g)
 	graph_frame = gtk_frame_new ("Graph type:");
 	gtk_container_add (GTK_CONTAINER (graph_frame), graph_box);
 
-#if GTK_MAJOR_VERSION < 2
-	gtk_object_set_data(GTK_OBJECT(graph_tseqstevens), "new-graph-type",
-                            (gpointer)0);
-	gtk_object_set_data(GTK_OBJECT(graph_tseqttrace), "new-graph-type",
-                            (gpointer)1);
-	gtk_object_set_data(GTK_OBJECT(graph_tput), "new-graph-type",
-                            (gpointer)2);
-	gtk_object_set_data(GTK_OBJECT(graph_rtt), "new-graph-type",
-                            (gpointer)3);
-
-        gtk_signal_connect(GTK_OBJECT(graph_tseqttrace), "toggled",
-                           (GtkSignalFunc)callback_graph_type, g);
-        gtk_signal_connect(GTK_OBJECT(graph_tseqstevens), "toggled",
-                           (GtkSignalFunc)callback_graph_type, g);
-        gtk_signal_connect(GTK_OBJECT(graph_tput), "toggled",
-                           (GtkSignalFunc)callback_graph_type, g);
-        gtk_signal_connect(GTK_OBJECT(graph_rtt), "toggled",
-                           (GtkSignalFunc)callback_graph_type, g);
-        gtk_signal_connect(GTK_OBJECT(graph_init), "toggled",
-                           (GtkSignalFunc)callback_graph_init_on_typechg, g);
-#else
-        g_object_set_data(G_OBJECT(graph_tseqstevens), "new-graph-type",
-                          (gpointer)0);
-        g_object_set_data(G_OBJECT(graph_tseqttrace), "new-graph-type",
-                          (gpointer)1);
-        g_object_set_data(G_OBJECT(graph_tput), "new-graph-type",
-                          (gpointer)2);
-        g_object_set_data(G_OBJECT(graph_rtt), "new-graph-type",
-                          (gpointer)3);
-
-        g_signal_connect(G_OBJECT(graph_tseqttrace), "toggled",
-                         G_CALLBACK(callback_graph_type), g);
-	g_signal_connect(G_OBJECT(graph_tseqstevens), "toggled",
-                         G_CALLBACK(callback_graph_type), g);
-	g_signal_connect(G_OBJECT(graph_tput), "toggled",
-                         G_CALLBACK(callback_graph_type), g);
-	g_signal_connect(G_OBJECT(graph_rtt), "toggled",
-                         G_CALLBACK(callback_graph_type), g);
-	g_signal_connect(G_OBJECT(graph_init), "toggled",
-                         G_CALLBACK(callback_graph_init_on_typechg), g);
-#endif
+	OBJECT_SET_DATA(graph_tseqstevens, "new-graph-type",
+                        GINT_TO_POINTER(0));
+	OBJECT_SET_DATA(graph_tseqttrace, "new-graph-type", GINT_TO_POINTER(1));
+	OBJECT_SET_DATA(graph_tput, "new-graph-type", GINT_TO_POINTER(2));
+	OBJECT_SET_DATA(graph_rtt, "new-graph-type", GINT_TO_POINTER(3));
+
+        SIGNAL_CONNECT(graph_tseqttrace, "toggled", callback_graph_type, g);
+        SIGNAL_CONNECT(graph_tseqstevens, "toggled", callback_graph_type, g);
+        SIGNAL_CONNECT(graph_tput, "toggled", callback_graph_type, g);
+        SIGNAL_CONNECT(graph_rtt, "toggled", callback_graph_type, g);
+        SIGNAL_CONNECT(graph_init, "toggled", callback_graph_init_on_typechg,
+                       g);
 
 	return graph_frame;
 }
@@ -1748,7 +1559,7 @@ static void callback_graph_type (GtkWidget *toggle, gpointer data)
 	int old_type, new_type;
 	struct graph *g = (struct graph * )data;
 
-	new_type = (int )gtk_object_get_data (GTK_OBJECT (toggle),"new-graph-type");
+	new_type = (int)OBJECT_GET_DATA(toggle,"new-graph-type");
 
 	if (!GTK_TOGGLE_BUTTON (toggle)->active)
 		return;
@@ -2809,20 +2620,9 @@ static void magnify_create (struct graph *g, int x, int y)
 	memcpy ((void * )mg, (void * )g, sizeof (struct graph));
 
 	mg->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
-#if GTK_MAJOR_VERSION < 2
-	gtk_signal_connect(GTK_OBJECT(mg->toplevel), "realize",
-                           GTK_SIGNAL_FUNC(window_icon_realize_cb), NULL);
-#else
-	g_signal_connect(G_OBJECT(mg->toplevel), "realize",
-                         G_CALLBACK(window_icon_realize_cb), NULL);
-#endif
+	SIGNAL_CONNECT(mg->toplevel, "realize", window_icon_realize_cb, NULL);
 	mg->drawing_area = mg->toplevel;
-#if GTK_MAJOR_VERSION < 2
-	gtk_widget_set_usize(mg->toplevel, g->magnify.width, g->magnify.height);
-#else
-	gtk_widget_set_size_request(mg->toplevel, g->magnify.width,
-                                    g->magnify.height);
-#endif
+	WIDGET_SET_SIZE(mg->toplevel, g->magnify.width, g->magnify.height);
 	gtk_widget_set_events (mg->drawing_area, GDK_EXPOSURE_MASK
 			/*		| GDK_ENTER_NOTIFY_MASK	*/
 			/*		| GDK_ALL_EVENTS_MASK	*/
diff --git a/gtk/ui_util.c b/gtk/ui_util.c
index e22377017f..332222acd7 100644
--- a/gtk/ui_util.c
+++ b/gtk/ui_util.c
@@ -1,7 +1,7 @@
 /* ui_util.c
  * UI utility routines
  *
- * $Id: ui_util.c,v 1.13 2002/11/03 17:38:34 oabad Exp $
+ * $Id: ui_util.c,v 1.14 2002/11/11 15:39:06 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -33,6 +33,8 @@
 #include "prefs.h"
 #include "epan/epan.h"
 #include "../ui_util.h"
+#include "compat_macros.h"
+
 #include "image/eicon3d16.xpm"
 
 
@@ -164,13 +166,7 @@ setup_scrolled_window(GtkWidget *scrollw)
 
   /* Catch the "destroy" event on the widget, so that we remove it from
      the list when it's destroyed. */
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(scrollw), "destroy",
-		     GTK_SIGNAL_FUNC(forget_scrolled_window), NULL);
-#else
-  g_signal_connect(G_OBJECT(scrollw), "destroy",
-                   G_CALLBACK(forget_scrolled_window), NULL);
-#endif
+  SIGNAL_CONNECT(scrollw, "destroy", forget_scrolled_window, NULL);
 }
 
 /* Remove a GtkScrolledWindow from the list of GtkScrolledWindows. */
@@ -258,13 +254,7 @@ setup_tree(GtkWidget *tree)
 
   /* Catch the "destroy" event on the widget, so that we remove it from
      the list when it's destroyed. */
-#if GTK_MAJOR_VERSION < 2
-  gtk_signal_connect(GTK_OBJECT(tree), "destroy",
-		     GTK_SIGNAL_FUNC(forget_tree), NULL);
-#else
-  g_signal_connect(G_OBJECT(tree), "destroy",
-                   G_CALLBACK(forget_tree), NULL);
-#endif
+  SIGNAL_CONNECT(tree, "destroy", forget_tree, NULL);
 }
 
 /* Remove a Tree from the list of Trees. */