marlin r1311 - in trunk: . marlin

[iain svn gnome org]

Author: iain
Date: Wed Oct 15 00:33:35 2008
New Revision: 1311
URL: http://svn.gnome.org/viewvc/marlin?rev=1311&view=rev

Log:
Require GTK 2.14


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/marlin/marlin-file-chooser.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Oct 15 00:33:35 2008
@@ -89,7 +89,7 @@
 AC_SUBST(MARLIN_CFLAGS)
 AC_SUBST(MARLIN_LIBS)
 
-PKG_CHECK_MODULES(MARLINX, gtk+-2.0 >= 2.10.0 libgnomeui-2.0 >= 2.6)
+PKG_CHECK_MODULES(MARLINX, gtk+-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.6)
 AC_SUBST(MARLINX_CFLAGS)
 AC_SUBST(MARLINX_LIBS)
 

Modified: trunk/marlin/marlin-file-chooser.c
==============================================================================
--- trunk/marlin/marlin-file-chooser.c	(original)
+++ trunk/marlin/marlin-file-chooser.c	Wed Oct 15 00:33:35 2008
@@ -22,6 +22,8 @@
 
 #include <glib/gi18n.h>
 
+#include <gio/gio.h>
+
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkstock.h>