From 970662db34ff0a718cd5e39c1fa268beb51e1f64 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 4 Jun 2010 07:05:46 -0400 Subject: More GTK3 preparation. This uses the new gtk_assistant_commit() I had added to GTK+ for our EImportAssistant progress page. --- widgets/misc/e-attachment-view.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'widgets/misc/e-attachment-view.c') diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 832565c929..b810e402c4 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -29,6 +29,8 @@ #include "e-util/e-selection.h" #include "e-util/e-ui-manager.h" #include "e-util/e-util.h" +#include "e-util/gtk-compat.h" + #include "e-attachment-dialog.h" #include "e-attachment-handler-image.h" #include "e-attachment-handler-sendto.h" @@ -1561,8 +1563,9 @@ e_attachment_view_drag_motion (EAttachmentView *view, if (!e_attachment_view_get_editable (view)) return FALSE; - actions = priv->drag_actions & context->actions; - chosen_action = context->suggested_action; + actions = gdk_drag_context_get_actions (context); + actions &= priv->drag_actions; + chosen_action = gdk_drag_context_get_suggested_action (context); if (chosen_action == GDK_ACTION_ASK) { GdkDragAction mask; -- cgit v1.2.3