[toolbar-editor] Syncing to GDK API changes

diff --git a/configure.ac b/configure.ac
index d145c7dde077a1673fdd0f93ffde638521d92680..571a3d0328818b2f4eb18cdb95602360eb953a24 100644 (file)
--- 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 44f032267ae45ac218dfac23dfb53aeba7f84910..9193120ad220288fda00cc5a1241373ef50b3240 100644 (file)
--- 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);
         }
     }