From: Jose Aliste <jose.aliste@gmail.com>
Date: Sun, 6 Jun 2010 23:50:31 +0000 (-0400)
Subject: [toolbar-editor] Syncing to GDK API changes
X-Git-Tag: EVINCE_2_31_4~36
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=c16ad49219beb256b7f6cea1d1ce8d8a4a2b654c;p=evince.git

[toolbar-editor] Syncing to GDK API changes
---

diff --git a/configure.ac b/configure.ac
index d145c7dd..571a3d03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"])
 AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
 
 dnl Specify required versions of dependencies
-GTK_REQUIRED=2.21.1
+GTK_REQUIRED=2.21.2
 GLIB_REQUIRED=2.25.7
 KEYRING_REQUIRED=2.22.0
 AC_SUBST([GLIB_REQUIRED])
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 44f03226..9193120a 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -695,12 +695,12 @@ 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_action (context) == GDK_ACTION_MOVE, time);
+			   gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time);
         }
       else
         {
           gtk_drag_finish (context, FALSE,
-			   gdk_drag_context_get_action (context) == GDK_ACTION_MOVE, time);
+			   gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time);
         }
     }