No need for a configure check; just use the GTK_CHECK_VERSION macro. Bug

2007-05-08  Christian Persch  <chpe@gnome.org>

	* configure.ac:
	* properties/ev-properties-view.c:

	No need for a configure check; just use the GTK_CHECK_VERSION macro.
	Bug #382438.

svn path=/trunk/; revision=2440

diff --git a/ChangeLog b/ChangeLog
index 9171b20234715115f98c23091944190cabb49f3a..e88543af8180d739661ad42e20659117b3cd9db3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-08  Christian Persch  <chpe@gnome.org>
+
+       * configure.ac:
+       * properties/ev-properties-view.c:
+
+       No need for a configure check; just use the GTK_CHECK_VERSION macro.
+       Bug #382438.
+
 2007-05-08  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index 3af99394841018858489ee3d17e3f03a2c9be329..f6b37be2bf168028ac386a9a0a85f043fe7fe4f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -443,11 +443,6 @@ if test "x$enable_impress" = "xyes"; then
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
-evince_save_LIBS=$LIBS
-LIBS="$LIBS $FRONTEND_LIBS"
-AC_CHECK_FUNCS(gtk_paper_size_get_paper_sizes)
-LIBS=$evince_save_LIBS
-
 AC_CONFIG_FILES([
 backend/Makefile
 backend/comics/Makefile

diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c
index 0df238aaba8ee201e8adc4a7cfd95f4f732b1635..3ebd368105e35db519c0de76b04971d3483b72b2 100644 (file)
--- a/properties/ev-properties-view.c
+++ b/properties/ev-properties-view.c
@@ -27,6 +27,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkversion.h>
 #include <glade/glade.h>
 #include <time.h>
 #include <sys/time.h>
@@ -193,7 +194,7 @@ set_property (GladeXML *xml, Property property, const char *text)
        g_free (valid_text);
 }
 
-#if HAVE_GTK_PAPER_SIZE_GET_PAPER_SIZES
+#if GTK_CHECK_VERSION (2, 11, 0)
 static GtkUnit
 get_default_user_units (void)
 {
@@ -296,7 +297,7 @@ ev_regular_paper_size (const EvDocumentInfo *info)
        
        return exact_size;
 }
-#else
+#else /* ! GTK 2.11.0 */
 /*
  * All values are in mm. 
  * Source: http://en.wikipedia.org/wiki/Paper_size
@@ -430,7 +431,7 @@ ev_regular_paper_size (const EvDocumentInfo *info)
        } else
                return exact_size;
 }
-#endif /* HAVE_GTK_PAPER_SIZE_GET_PAPER_SIZES */
+#endif /* GTK 2.11.0 */
 
 void
 ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo *info)