Rename error as mdvi_error to avoid symbol conflicts with the libc error.

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

diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c
index 3ebd368105e35db519c0de76b04971d3483b72b2..6a1eb413962436765c28e1648b30ad63fcba6a9b 100644 (file)
--- a/properties/ev-properties-view.c
+++ b/properties/ev-properties-view.c
@@ -18,25 +18,23 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 

-#ifdef HAVE_CONFIG_H

 #include "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 <gtk/gtkversion.h>
-#include <glade/glade.h>
-#include <time.h>
-#include <sys/time.h>

 #include <string.h>
 #include <string.h>

+#include <sys/time.h>
+#include <time.h>

 
 #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
 #include <langinfo.h>
 #endif
 
 
 #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,
 typedef enum
 {
        TITLE_PROPERTY,


@@ -216,10 +214,12 @@ get_default_user_units (void)
                return GTK_UNIT_MM;  /* metric */
 #endif
 
                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;
        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;
 }
                                
        return GTK_UNIT_MM;
 }