diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-08-31 06:30:39 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <descalante@igalia.com> | 2010-08-31 06:30:39 +0800 |
| commit | a9117564ee41408ebadbed39612a0d4a8ae86328 (patch) | |
| tree | f97b26157bc749ba691af1f0bd2244055ec01870 | |
| parent | fef8d23fb16d053f81f6ae35dc9c20dc6a258ea9 (diff) | |
| download | gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.tar gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.tar.gz gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.tar.bz2 gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.tar.lz gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.tar.xz gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.tar.zst gsoc2013-epiphany-a9117564ee41408ebadbed39612a0d4a8ae86328.zip | |
Revert "Use accessor functions when possible"
This reverts commit ca325b4415d057a75ebdce5bb77b4d64b485eeb6.
| -rw-r--r-- | lib/egg/egg-editable-toolbar.c | 8 | ||||
| -rw-r--r-- | 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 adcab7f4a..10906c349 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, gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time); + gtk_drag_finish (context, TRUE, context->action == GDK_ACTION_MOVE, time); } else { - gtk_drag_finish (context, FALSE, gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time); + gtk_drag_finish (context, FALSE, context->action == GDK_ACTION_MOVE, time); } } @@ -761,7 +761,7 @@ toolbar_drag_motion_cb (GtkToolbar *toolbar, etoolbar->priv->dnd_toolitem, ipos); } - gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), time); + gdk_drag_status (context, context->suggested_action, 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, gdk_visual_get_depth (visual)); + pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, visual->depth); 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 1e7fd5c86..3a62a226b 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 = gdk_drag_context_get_suggested_action (context); + action = context->suggested_action; } } |