diff options
author | Bill Meier <wmeier@newsguy.com> | 2008-04-11 16:55:44 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2008-04-11 16:55:44 +0000 |
commit | 77b615b79fd830ed353e7587e48e861af77c705d (patch) | |
tree | e31cc1f70a8f26978bfb6f940cfeb14164659d06 /gtk/rtp_player.c | |
parent | 74e1c12021564f0af8bfb53c60417c632ae7cdf7 (diff) | |
download | wireshark-77b615b79fd830ed353e7587e48e861af77c705d.tar.gz |
OBJECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24896
Diffstat (limited to 'gtk/rtp_player.c')
-rw-r--r-- | gtk/rtp_player.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |