talons

commit 09931a2055bff0ee35a2961c889c30d57e62e8b0
parent 4f21ed7d70e42148a9cb125a4d09f39be8c7fbf1
Author: Colin Leroy <colin@colino.net>
Date:   Sat, 22 Oct 2011 15:48:07 +0000

2011-10-22 [colin]	3.7.10cvs40

	* src/gtk/gtkutils.h
	* configure.ac
		Fix (hopefully) build with GTK+ 2.18.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
4
++--
M
src/gtk/gtkutils.h
 | 
7
+++++++

4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-22 [colin]	3.7.10cvs40
+
+	* src/gtk/gtkutils.h
+	* configure.ac
+		Fix (hopefully) build with GTK+ 2.18.
+
 2011-10-20 [paul]	3.7.10cvs39
 
 	* AUTHORS
diff --git a/PATCHSETS b/PATCHSETS
@@ -4243,3 +4243,4 @@
 ( cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/prefs_msg_colors.c;  ) > 3.7.10cvs37.patchset
 ( cvs diff -u -r 1.42.2.55 -r 1.42.2.56 po/fr.po;  cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/common/defs.h;  ) > 3.7.10cvs38.patchset
 ( cvs diff -u -r 1.100.2.80 -r 1.100.2.81 AUTHORS;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/ldif.c;  cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/gtk/authors.h;  ) > 3.7.10cvs39.patchset
+( cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/gtkutils.h;  cvs diff -u -r 1.654.2.4320 -r 1.654.2.4321 configure.ac;  ) > 3.7.10cvs40.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -475,7 +475,7 @@ if test x"$ac_cv_enable_gtk3" = x"yes"; then
 	AM_CONDITIONAL(GTK3, true)
 	AM_CONDITIONAL(GTK2, false)
 else
-	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
 
 	dnl --disable-deprecated switch for GTK2 purification
 	AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
@@ -254,4 +254,11 @@ claws_input_add    (gint	      source,
 #define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
 #define gtk_button_get_event_window(x) ((x)->event_window)
 #endif
+#if !GTK_CHECK_VERSION(2,20,0)
+#define gtk_widget_get_requisition(x,r) (*(r) = (x)->requisition)
+#endif
+#if !GTK_CHECK_VERSION(2,18,0)
+#define gtk_widget_get_allocation(x,a) (*(a) = (x)->allocation)
+#define gtk_widget_get_state(x) ((x)->state)
+#endif
 #endif /* __GTKUTILS_H__ */