summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-04-21 12:20:46 -0700
committerStefano Karapetsas <[email protected]>2013-04-21 12:20:46 -0700
commitd242b0e941799cd5d00d9711802a3896ab7bd3cf (patch)
tree53125049c568aed07f025f4d5994a4c28bb79686
parent457a0b86a2e213c36a0f0c776cef90bd560c6684 (diff)
parenta6b92010adfac205341cf0579b5b102a520f798e (diff)
downloadeom-d242b0e941799cd5d00d9711802a3896ab7bd3cf.tar.bz2
eom-d242b0e941799cd5d00d9711802a3896ab7bd3cf.tar.xz
Merge pull request #15 from eyelash/gseal
replace direct struct access with accessor functions
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.c6
-rw-r--r--src/eom-window.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 2d42f29..c7a4007 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -688,11 +688,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);
}
}
@@ -751,7 +751,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;
}
diff --git a/src/eom-window.c b/src/eom-window.c
index 7a8ec7a..aa1ae6f 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -4182,7 +4182,7 @@ eom_window_drag_data_received (GtkWidget *widget,
if (!gtk_targets_include_uri (&target, 1))
return;
- if (context->suggested_action == GDK_ACTION_COPY) {
+ if (gdk_drag_context_get_suggested_action (context) == GDK_ACTION_COPY) {
window = EOM_WINDOW (widget);
file_list = eom_util_parse_uri_string_list_to_file_list ((const gchar *) gtk_selection_data_get_data (selection_data));