Updated French translation by Robert-André Mauchin.

[evince.git] / properties / ev-properties-view.c

diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c
index 0df238aaba8ee201e8adc4a7cfd95f4f732b1635..6a1eb413962436765c28e1648b30ad63fcba6a9b 100644 (file)
--- a/properties/ev-properties-view.c
+++ b/properties/ev-properties-view.c
@@ -18,24 +18,23 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#include "ev-properties-view.h"
-#include "ev-document-fonts.h"
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <time.h>
-#include <sys/time.h>
 #include <string.h>
+#include <sys/time.h>
+#include <time.h>
 
 #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
 #include <langinfo.h>
 #endif
 
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+
+#include "ev-properties-view.h"
+#include "ev-document-fonts.h"
+
 typedef enum
 {
        TITLE_PROPERTY,
@@ -193,7 +192,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)
 {
@@ -215,10 +214,12 @@ get_default_user_units (void)
                return GTK_UNIT_MM;  /* metric */
 #endif
 
+       if (strcmp (e, "default:mm") == 0)
+               return GTK_UNIT_MM;
        if (strcmp (e, "default:inch") == 0)
                return GTK_UNIT_INCH;
-       else if (strcmp (e, "default:mm") == 0)
-               g_warning ("Whoever translated default:mm did so wrongly.\n");
+       
+       g_warning ("Whoever translated default:mm did so wrongly.\n");
                                
        return GTK_UNIT_MM;
 }
@@ -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)