From: Vladimir Nadvornik <nadvornik@suse.cz>
Date: Tue, 14 Aug 2012 19:58:57 +0000 (+0200)
Subject: more compilation fixes
X-Git-Tag: v1.2~157
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=a2e7d1772a5ab89dd1f1825f2cc27c6dc711fd05

more compilation fixes
---

diff --git a/configure.in b/configure.in
index b4354f8e..cae8dafb 100644
--- a/configure.in
+++ b/configure.in
@@ -189,7 +189,7 @@ else
   prefix=$prefix
 fi
 
-AM_PATH_GLIB_2_0(2.4.0,,AC_MSG_ERROR(GLIB >= 2.4.0 not installed.))
+AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
 AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])])
 
 if test x$gtk3 == xyes; then
@@ -203,7 +203,7 @@ else
 fi
 
 if test x$gtk3 == xno; then
-    m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.12.0 not installed.))])
+    m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))])
     true
 fi
 
diff --git a/src/compat.h b/src/compat.h
index dd1b268f..98cf22b6 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -28,7 +28,7 @@ GList* hash_table_get_keys(GHashTable *hash_table);
 #define	MAP_ANON	MAP_ANONYMOUS
 #endif
 
-#ifndef GDK_KEY_Up
+#if !GTK_CHECK_VERSION(2,22,0)
 #define GDK_KEY_BackSpace	GDK_BackSpace
 #define GDK_KEY_Delete		GDK_Delete
 #define GDK_KEY_Down		GDK_Down
@@ -78,7 +78,7 @@ gint compat_gdk_window_get_height(GdkWindow *window);
 
 #endif
 
-#if !GTK_CHECK_VERSION(2,24,0)
+#if !GTK_CHECK_VERSION(2,22,0)
 #define gdk_window_create_similar_surface(window, content, width, height) compat_gdk_window_create_similar_surface(window, content, width, height)
 cairo_surface_t *compat_gdk_window_create_similar_surface (GdkWindow *window, cairo_content_t content, gint width, gint height);