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

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

1 files changed, 6 insertions, 6 deletions

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