OBJECT_..._DATA --> g_object_..._data

svn path=/trunk/; revision=24896

11 files changed, 68 insertions, 68 deletions

diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index c6782c0e29..36ba0e1b0e 100644
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -185,7 +185,7 @@ welcome_link_enter_cb(GtkWidget *widget _U_, GdkEventCrossing *event _U_, gpoint
     gchar *message;
     GtkWidget *w = user_data;
 
-    message = g_strdup_printf("<span foreground='blue' underline='single'>%s</span>", OBJECT_GET_DATA(w,"TEXT"));
+    message = g_strdup_printf("<span foreground='blue' underline='single'>%s</span>", g_object_get_data(G_OBJECT(w),"TEXT"));
     gtk_label_set_markup(GTK_LABEL(w), message);
     g_free(message);
 
@@ -198,7 +198,7 @@ welcome_link_leave_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer user_
     gchar *message;
     GtkWidget *w = user_data;
 
-    message = g_strdup_printf("<span foreground='blue'>%s</span>", OBJECT_GET_DATA(w,"TEXT"));
+    message = g_strdup_printf("<span foreground='blue'>%s</span>", g_object_get_data(G_OBJECT(w),"TEXT"));
     gtk_label_set_markup(GTK_LABEL(w), message);
     g_free(message);
 
@@ -236,7 +236,7 @@ welcome_link_new(const gchar *text, GtkWidget **label /*, void *callback, void *
     SIGNAL_CONNECT(eb, "button-press-event", welcome_link_press_cb, w);
 
     /* XXX - memleak */
-    OBJECT_SET_DATA(w, "TEXT", g_strdup(text));
+    g_object_set_data(G_OBJECT(w), "TEXT", g_strdup(text));
 
     return eb;
 }
diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c
index 50f9f893f7..5cf6b867fe 100644
--- a/gtk/pixmap_save.c
+++ b/gtk/pixmap_save.c
@@ -59,7 +59,7 @@ pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf)
 	gboolean ret;
 
 	filename = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_as_w)));
-	type_cm = OBJECT_GET_DATA(save_as_w, "type_cm");
+	type_cm = g_object_get_data(G_OBJECT(save_as_w), "type_cm");
 	file_type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_cm));
 	
 	/* Perhaps the user specified a directory instead of a file.
@@ -93,7 +93,7 @@ pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf)
 void
 pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_)
 {
-	GdkPixmap *pixmap = OBJECT_GET_DATA(w, "pixmap");
+        GdkPixmap *pixmap = g_object_get_data(G_OBJECT(w), "pixmap");
 	GdkPixbuf *pixbuf;
 	GdkPixbufFormat *pixbuf_format;
 	GtkWidget *main_vb, *save_as_type_hb, *type_lb, *type_cm;
@@ -152,7 +152,7 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_)
 	g_slist_free(file_formats);
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(type_cm), 0);
-	OBJECT_SET_DATA(save_as_w, "type_cm", type_cm);
+	g_object_set_data(G_OBJECT(save_as_w), "type_cm", type_cm);
 	gtk_widget_show(type_cm);
 
 	SIGNAL_CONNECT(save_as_w, "destroy", pixbuf_save_destroy_cb, NULL);
diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c
index 6975ae0c79..7c1842af5c 100644
--- a/gtk/progress_dlg.c
+++ b/gtk/progress_dlg.c
@@ -187,7 +187,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.
      */
-    OBJECT_SET_DATA(dlg_w, PROG_BAR_KEY, prog_bar);
+    g_object_set_data(G_OBJECT(dlg_w), PROG_BAR_KEY, prog_bar);
 
     /*
      * Static and dynamic boxes are now complete
@@ -203,7 +203,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title,
     gtk_container_add(GTK_CONTAINER(main_vb), bbox);
     gtk_widget_show(bbox);
 
-    cancel_bt = OBJECT_GET_DATA(bbox, terminate_is_stop ? GTK_STOCK_STOP :
+    cancel_bt = g_object_get_data(G_OBJECT(bbox), terminate_is_stop ? GTK_STOCK_STOP :
                                 GTK_STOCK_CANCEL);
     gtk_widget_grab_default(cancel_bt);
 
@@ -388,7 +388,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status)
 	}
 
 	/* update progress bar */
-	prog_bar = OBJECT_GET_DATA(dlg_w, PROG_BAR_KEY);
+	prog_bar = g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY);
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage);
 
 	/*
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 00dc0362d5..42d7ad3d2a 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -301,7 +301,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
 	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
 	gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
-	close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+	close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
 	window_set_cancel_button(rs->win, close_bt, window_cancel_button_cb);
 
 	SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL);
@@ -420,7 +420,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	  "Service Response Time Statistics Filter",
 	  TRUE,
 	  FALSE,
-      FALSE
+          FALSE
 	};
 
 	/* if the window is already open, bring it to front */
@@ -496,10 +496,10 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	/* Filter entry */
 	filter_entry=gtk_entry_new();
-    SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
+        SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
 
 	/* filter prefs dialog */
-	OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
+        g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry);
 	/* filter prefs dialog */
 
 	gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
@@ -513,27 +513,27 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_show(filter_box);
 
 	/* button box */
-    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+        bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
-    gtk_widget_show(bbox);
+        gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
-    g_signal_connect_swapped(start_button, "clicked",
+        start_button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT);
+        g_signal_connect_swapped(start_button, "clicked",
 			     G_CALLBACK(rpcstat_start_button_clicked), NULL);
 
-    cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
-    window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
+        cancel_button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+        window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
 
 	/* Give the initial focus to the "Filter" entry box. */
 	gtk_widget_grab_focus(filter_entry);
 
-    gtk_widget_grab_default(start_button );
+        gtk_widget_grab_default(start_button );
 
-    SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
+        SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
 	SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 
-    gtk_widget_show_all(dlg);
-    window_present(dlg);
+        gtk_widget_show_all(dlg);
+        window_present(dlg);
 }
 
 
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index 0de334aab5..babd60fffa 100644
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -1319,7 +1319,7 @@ static gint expose_event_channels(GtkWidget *widget, GdkEventExpose *event)
 {
 	rtp_channel_info_t *rci;
 
-	rci=(rtp_channel_info_t *)OBJECT_GET_DATA(widget, "rtp_channel_info_t");
+	rci=(rtp_channel_info_t *)g_object_get_data(G_OBJECT(widget), "rtp_channel_info_t");
 	if(!rci){
 		exit(10);
 	}
@@ -1360,7 +1360,7 @@ configure_event_channels(GtkWidget *widget, GdkEventConfigure *event _U_)
 		{0,     0xFFFF, 0xFFFF, 0x99FF}
 	};
 
-	rci=(rtp_channel_info_t *)OBJECT_GET_DATA(widget, "rtp_channel_info_t");
+	rci=(rtp_channel_info_t *)g_object_get_data(G_OBJECT(widget), "rtp_channel_info_t");
 	if(!rci){
 		exit(10);
 	}
@@ -1402,7 +1402,7 @@ button_press_event_channel(GtkWidget *widget, GdkEventButton *event _U_)
 	int this_channel;
 	guint32 prev_index;
 
-	rci=(rtp_channel_info_t *)OBJECT_GET_DATA(widget, "rtp_channel_info_t");
+	rci=(rtp_channel_info_t *)g_object_get_data(G_OBJECT(widget), "rtp_channel_info_t");
 	if(!rci){
 		exit(10);
 	}
@@ -1497,7 +1497,7 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _
 	gtk_container_add(GTK_CONTAINER(viewport), rci->draw_area);
 	gtk_container_add(GTK_CONTAINER(rci->scroll_window), viewport);
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-	OBJECT_SET_DATA(rci->draw_area, "rtp_channel_info_t", rci);
+	g_object_set_data(G_OBJECT(rci->draw_area), "rtp_channel_info_t", rci);
 	gtk_widget_add_events (rci->draw_area, GDK_BUTTON_PRESS_MASK);
 	GTK_WIDGET_SET_FLAGS(rci->draw_area, GTK_CAN_FOCUS);
 	gtk_widget_grab_focus(rci->draw_area);
diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index 4e3fb2fec5..9e45f538c4 100644
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -274,7 +274,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
 	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
 	gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
-	close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+	close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
 	window_set_cancel_button(rs->win, close_bt, window_cancel_button_cb);
 
 	SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL);
@@ -388,10 +388,10 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
 
 	/* Filter entry */
 	filter_entry=gtk_entry_new();
-    SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
+        SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
 
 	/* filter prefs dialog */
-	OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
+        g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry);
 	/* filter prefs dialog */
 
 	gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
@@ -405,27 +405,27 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_show(filter_box);
 
 	/* button box */
-    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+        bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
-    gtk_widget_show(bbox);
+        gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
-    g_signal_connect_swapped(start_button, "clicked",
+        start_button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT);
+        g_signal_connect_swapped(start_button, "clicked",
 			     G_CALLBACK(scsistat_start_button_clicked), NULL);
 
-    cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
-    window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
+        cancel_button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+        window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
 
 	/* Give the initial focus to the "Filter" entry box. */
 	gtk_widget_grab_focus(filter_entry);
 
-    gtk_widget_grab_default(start_button );
+        gtk_widget_grab_default(start_button );
 
-    SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
+        SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
 	SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 
-    gtk_widget_show_all(dlg);
-    window_present(dlg);
+        gtk_widget_show_all(dlg);
+        window_present(dlg);
 }
 
 
diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 160cd6a95d..2642c6a12b 100644
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -484,7 +484,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
 	/* Start a notebook for flipping between sets of changes */
 	notebook = gtk_notebook_new();
 	gtk_container_add(GTK_CONTAINER(main_vb), notebook);
-	OBJECT_SET_DATA(window, "notebook", notebook);
+	g_object_set_data(G_OBJECT(window), "notebook", notebook);
 	SIGNAL_CONNECT(notebook, "switch_page", on_notebook_switch_page,NULL);
 
 	page1 = gtk_vbox_new(FALSE, 8);
diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 66d9b383ef..4d3ace4bfa 100644
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -588,7 +588,7 @@ static void sctp_graph_redraw(struct sctp_udata *u_data)
 			draw_sack_graph(u_data);
 			break;
 	}
-	ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+	ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 	if(!ios){
 		exit(10);
@@ -672,7 +672,7 @@ expose_event(GtkWidget *widget, GdkEventExpose *event)
 {
 	sctp_graph_t *ios;
 
-	ios=(sctp_graph_t *)OBJECT_GET_DATA(widget, "sctp_graph_t");
+	ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(widget), "sctp_graph_t");
 	if(!ios){
 		exit(10);
 	}
@@ -822,7 +822,7 @@ on_button_press (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_udata
 		                   (gint)floor(MIN(u_data->io->y_old,u_data->io->y_new)),
 		                   (gint)abs((long)(u_data->io->x_new-u_data->io->x_old)),
 		                   (gint)abs((long)(u_data->io->y_new-u_data->io->y_old)));
-		ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+		ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 		if(!ios){
 			exit(10);
@@ -884,7 +884,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 		                   u_data->io->rect_x_min, u_data->io->rect_y_min,
 		                   u_data->io->rect_x_max - u_data->io->rect_x_min,
 				   u_data->io->rect_y_max - u_data->io->rect_y_min);
-		ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+		ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 		if(!ios){
 			exit(10);
@@ -1015,7 +1015,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 			                (gint)(position),
 			                (gint)(event->y-10),
 			                layout);
-			ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+			ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 			if(!ios){
 				exit(10);
@@ -1185,7 +1185,7 @@ static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data)
 {
 	u_data->io->draw_area=gtk_drawing_area_new();
 	SIGNAL_CONNECT(u_data->io->draw_area, "destroy", quit, u_data);
-	OBJECT_SET_DATA(u_data->io->draw_area, "sctp_graph_t", u_data->io);
+	g_object_set_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t", u_data->io);
 
 	WIDGET_SET_SIZE(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height);
 
diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 1ed23f9087..15572b93d9 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -634,7 +634,7 @@ sctp_graph_t *ios;
 			draw_sack_graph(u_data);
 			break;
 	}
-	ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+	ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 	if(!ios){
 		exit(10);
@@ -720,7 +720,7 @@ expose_event(GtkWidget *widget, GdkEventExpose *event)
 {
 	sctp_graph_t *ios;
 
-	ios=(sctp_graph_t *)OBJECT_GET_DATA(widget, "sctp_graph_t");
+	ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(widget), "sctp_graph_t");
 	if(!ios){
 		exit(10);
 	}
@@ -871,7 +871,7 @@ on_button_press (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_udata
 		                   (gint)floor(MIN(u_data->io->y_old,u_data->io->y_new)),
 		                   (gint)floor(abs((long)(u_data->io->x_new-u_data->io->x_old))),
 		                   (gint)floor(abs((long)(u_data->io->y_new-u_data->io->y_old))));
-		ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+		ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 		if(!ios){
 			exit(10);
@@ -933,7 +933,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 		                   u_data->io->rect_x_min, u_data->io->rect_y_min,
 		                   u_data->io->rect_x_max - u_data->io->rect_x_min,
 				   u_data->io->rect_y_max - u_data->io->rect_y_min);
-		ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+		ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 		if(!ios){
 			exit(10);
@@ -1090,7 +1090,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 			                (gint)(event->y-10),
 			                layout);
 
-			ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
+			ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
 
 			if(!ios){
 				exit(10);
@@ -1261,7 +1261,7 @@ static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data)
 
 	u_data->io->draw_area=gtk_drawing_area_new();
 	SIGNAL_CONNECT(u_data->io->draw_area, "destroy", quit, u_data);
-	OBJECT_SET_DATA(u_data->io->draw_area, "sctp_graph_t", u_data->io);
+	g_object_set_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t", u_data->io);
 
 	WIDGET_SET_SIZE(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height);
 
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 1bf02bcabd..edfafddce8 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -208,10 +208,10 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 
 	/* Filter entry */
 	current_dlg->filter_entry=gtk_entry_new();
-    SIGNAL_CONNECT(current_dlg->filter_entry, "changed", filter_te_syntax_check_cb, NULL);
+        SIGNAL_CONNECT(current_dlg->filter_entry, "changed", filter_te_syntax_check_cb, NULL);
 	
 	/* filter prefs dialog */
-	OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, current_dlg->filter_entry);
+        g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, current_dlg->filter_entry);
 	/* filter prefs dialog */
 	
 	gtk_box_pack_start(GTK_BOX(filter_box), current_dlg->filter_entry, TRUE, TRUE, 0);
@@ -225,16 +225,16 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 	gtk_widget_show(filter_box);
 
 	/* button box */
-    bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
+        bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
 	gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
-    gtk_widget_show(bbox);
+        gtk_widget_show(bbox);
 
-    start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
-    SIGNAL_CONNECT(start_button, "clicked",
+        start_button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT);
+        SIGNAL_CONNECT(start_button, "clicked",
                               tap_dfilter_dlg_start_button_clicked, current_dlg);
 
-    cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
-    window_set_cancel_button(current_dlg->dlg, cancel_button, window_cancel_button_cb);
+        cancel_button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+        window_set_cancel_button(current_dlg->dlg, cancel_button, window_cancel_button_cb);
 
 	/* Catch the "activate" signal on the filter text entry, so that
 	   if the user types Return there, we act as if the "Create Stat"
@@ -246,11 +246,11 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 	/* Give the initial focus to the "Filter" entry box. */
 	gtk_widget_grab_focus(current_dlg->filter_entry);
 
-    gtk_widget_grab_default(start_button );
+        gtk_widget_grab_default(start_button );
 
-    SIGNAL_CONNECT(current_dlg->dlg, "delete_event", window_delete_event_cb, NULL);
+        SIGNAL_CONNECT(current_dlg->dlg, "delete_event", window_delete_event_cb, NULL);
 	SIGNAL_CONNECT(current_dlg->dlg, "destroy", dlg_destroy_cb, current_dlg);
 
-    gtk_widget_show_all(current_dlg->dlg);
-    window_present(current_dlg->dlg);
+        gtk_widget_show_all(current_dlg->dlg);
+        window_present(current_dlg->dlg);
 }
diff --git a/gtk/text_page.c b/gtk/text_page.c
index 7e9c7a0a78..772e2095b1 100644
--- a/gtk/text_page.c
+++ b/gtk/text_page.c
@@ -73,7 +73,7 @@ GtkWidget * text_page_new(const char *absolute_path)
   /* gtk_text_view_set_left_margin(GTK_TEXT_VIEW(txt), 3); */
   /* gtk_text_view_set_right_margin(GTK_TEXT_VIEW(txt), 3); */
 
-  OBJECT_SET_DATA(page_vb, TEXT_KEY, txt);
+  g_object_set_data(G_OBJECT(page_vb), TEXT_KEY, txt);
 
   text_page_set_text(page_vb, absolute_path);
   gtk_container_add(GTK_CONTAINER(txt_scrollw), txt);
@@ -89,7 +89,7 @@ GtkWidget * text_page_new(const char *absolute_path)
  */
 static void text_page_insert(GtkWidget *page, const char *buffer, int nchars)
 {
-    GtkWidget *txt = OBJECT_GET_DATA(page, TEXT_KEY);
+    GtkWidget *txt = g_object_get_data(G_OBJECT(page), TEXT_KEY);
 
     GtkTextBuffer *buf= gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt));
     GtkTextIter    iter;
@@ -132,7 +132,7 @@ static void text_page_set_text(GtkWidget *page, const char *absolute_path)
  */
 static void text_page_clear(GtkWidget *page)
 {
-  GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(OBJECT_GET_DATA(page, TEXT_KEY)));
+  GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(g_object_get_data(G_OBJECT(page), TEXT_KEY)));
 
   gtk_text_buffer_set_text(buf, "", 0);
 }