From ca325b4415d057a75ebdce5bb77b4d64b485eeb6 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sat, 12 Jun 2010 22:44:24 +0300 Subject: Use accessor functions when possible --- lib/egg/egg-editable-toolbar.c | 8 ++++---- lib/widgets/ephy-node-view.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 10906c349..adcab7f4a 100644 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -698,11 +698,11 @@ toolbar_drag_data_received_cb (GtkToolbar *toolbar, { gint tpos = get_toolbar_position (etoolbar, GTK_WIDGET (toolbar)); egg_toolbars_model_add_item (etoolbar->priv->model, tpos, ipos, name); - gtk_drag_finish (context, TRUE, context->action == GDK_ACTION_MOVE, time); + gtk_drag_finish (context, TRUE, gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time); } else { - gtk_drag_finish (context, FALSE, context->action == GDK_ACTION_MOVE, time); + gtk_drag_finish (context, FALSE, gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time); } } @@ -761,7 +761,7 @@ toolbar_drag_motion_cb (GtkToolbar *toolbar, etoolbar->priv->dnd_toolitem, ipos); } - gdk_drag_status (context, context->suggested_action, time); + gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), time); return TRUE; } @@ -1814,7 +1814,7 @@ new_pixbuf_from_widget (GtkWidget *widget) /* Create a pixmap */ visual = gtk_widget_get_visual (window); - pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, visual->depth); + pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, gdk_visual_get_depth (visual)); gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window)); /* Draw the window */ diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index 3a62a226b..1e7fd5c86 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -321,7 +321,7 @@ drag_motion_cb (GtkWidget *widget, priority != EPHY_NODE_VIEW_SPECIAL_PRIORITY && ephy_node_get_is_drag_source (node)) { - action = context->suggested_action; + action = gdk_drag_context_get_suggested_action (context); } } -- cgit v1.2.3