X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=properties%2Fev-properties-view.c;h=4162fddd3dc8bbe8049c6d3f92e6ba1cbfbfba3d;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=0df238aaba8ee201e8adc4a7cfd95f4f732b1635;hpb=1cd64c8488e0ec0cafcac4f5c81367798f797f30;p=evince.git diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c index 0df238aa..4162fddd 100644 --- a/properties/ev-properties-view.c +++ b/properties/ev-properties-view.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -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) { @@ -215,10 +216,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 +299,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 +433,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)