[evince] [toolbar-editor] Fix build with GSEAL enabled
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] [toolbar-editor] Fix build with GSEAL enabled
- Date: Mon, 31 May 2010 17:32:43 +0000 (UTC)
commit d2ecbc76da7d7c815b857d1aa87d2a4df76aabff
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Mon May 31 19:31:14 2010 +0200
[toolbar-editor] Fix build with GSEAL enabled
configure.ac | 2 +-
cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8d8b441..8977b58 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.0
+GTK_REQUIRED=2.21.1
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 35a605d..44f0322 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -694,11 +694,13 @@ 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_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_action (context) == GDK_ACTION_MOVE, time);
}
}
@@ -757,7 +759,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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]