aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-06-04 19:05:46 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-04 20:34:15 +0800
commit970662db34ff0a718cd5e39c1fa268beb51e1f64 (patch)
tree73c987b95c107ae7e3014abdca4c95de12dc853d /e-util
parent3ee48d9bf66fbc76b7b06e77aafa015c341cd419 (diff)
downloadgsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.gz
gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.zst
gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.zip
More GTK3 preparation.
This uses the new gtk_assistant_commit() I had added to GTK+ for our EImportAssistant progress page.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/Makefile.am1
-rw-r--r--e-util/gtk-compat.h21
2 files changed, 22 insertions, 0 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index a258c64f01..7df0e0d49e 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -137,6 +137,7 @@ libeutil_la_SOURCES = \
e-util-private.h \
e-xml-utils.c \
gconf-bridge.c \
+ gtk-compat.h \
$(PLATFORM_SOURCES)
MARSHAL_GENERATED = e-marshal.c e-marshal.h
diff --git a/e-util/gtk-compat.h b/e-util/gtk-compat.h
new file mode 100644
index 0000000000..75b32977a1
--- /dev/null
+++ b/e-util/gtk-compat.h
@@ -0,0 +1,21 @@
+#ifndef __GTK_COMPAT_H__
+#define __GTK_COMPAT_H__
+
+#include <gtk/gtk.h>
+
+/* Provide a compatibility layer for accessor functions introduced
+ * in GTK+ 2.22 which we need to build with sealed GDK. That way it
+ * is still possible to build with GTK+ 2.20. */
+
+#if !GTK_CHECK_VERSION(2,21,0)
+
+#define gdk_drag_context_get_actions(context) (context)->actions
+#define gdk_drag_context_get_suggested_action(context) (context)->suggested_action
+#define gdk_drag_context_get_selected_action(context) (context)->action
+#define gdk_drag_context_list_targets(context) (context)->targets
+
+#define gtk_accessible_get_widget(accessible) \
+ (GTK_ACCESSIBLE (accessible)->widget)
+#endif
+
+#endif /* __GTK_COMPAT_H__ */