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

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

1 files changed, 14 insertions, 14 deletions

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);
 }