[evolution-data-server] Use accessors for newly sealed GdkDragContext members
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Use accessors for newly sealed GdkDragContext members
- Date: Thu, 3 Jun 2010 22:31:25 +0000 (UTC)
commit 4d976b725d6d5d74154427cfaf8caecf52b6c6bf
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Jun 3 12:41:36 2010 +0200
Use accessors for newly sealed GdkDragContext members
This bumps the required GTK+ version to 2.22
https://bugzilla.gnome.org/show_bug.cgi?id=620466
configure.ac | 2 +-
libedataserverui/e-source-selector.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0796e0f..68dd648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl Required Package Versions
m4_define([glib_minimum_version], [2.16.1])
-m4_define([gtk_minimum_version], [2.20.0])
+m4_define([gtk_minimum_version], [2.22.0])
m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libxml_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libsoup_minimum_version], [2.3.0])
diff --git a/libedataserverui/e-source-selector.c b/libedataserverui/e-source-selector.c
index f6ee77f..ea93e73 100644
--- a/libedataserverui/e-source-selector.c
+++ b/libedataserverui/e-source-selector.c
@@ -964,10 +964,10 @@ source_selector_drag_motion (GtkWidget *widget,
pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
gtk_tree_view_set_drag_dest_row (tree_view, path, pos);
- if (context->actions & GDK_ACTION_MOVE)
+ if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE)
action = GDK_ACTION_MOVE;
else
- action = context->suggested_action;
+ action = gdk_drag_context_get_suggested_action (context);
exit:
if (path != NULL)
@@ -1033,7 +1033,7 @@ source_selector_drag_data_received (GtkWidget *widget,
tree_view = GTK_TREE_VIEW (widget);
model = gtk_tree_view_get_model (tree_view);
- delete = (context->action == GDK_ACTION_MOVE);
+ delete = (gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE);
if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
goto exit;
@@ -1048,7 +1048,8 @@ source_selector_drag_data_received (GtkWidget *widget,
g_signal_emit (
widget, signals[DATA_DROPPED], 0, selection_data,
- object, context->action, info, &success);
+ object, gdk_drag_context_get_selected_action (context),
+ info, &success);
exit:
if (path != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]