X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=previewer%2Fev-previewer.c;h=50290798575cf0e2f09cf4fc40673d768e9bac55;hb=d4139205b010ed06310d14284e63114e88ec6de2;hp=14d4f2f332306543779310a2f53998b61013c0b5;hpb=61c9b15fa57e40c9561ae8d5ca13228d4e7a897a;p=evince.git diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c index 14d4f2f3..50290798 100644 --- a/previewer/ev-previewer.c +++ b/previewer/ev-previewer.c @@ -28,9 +28,6 @@ #include "ev-previewer-window.h" #ifdef G_OS_WIN32 -#ifdef DATADIR -#undef DATADIR -#endif #include #include #if !(_WIN32_WINNT >= 0x0500) @@ -100,33 +97,6 @@ ev_previewer_load_document (const gchar *filename, g_free (uri); } -static gchar* -ev_previewer_get_locale_dir () -{ -#ifdef G_OS_WIN32 - gchar *install_dir = NULL, *locale_dir; - gchar *retval = NULL; - - install_dir = - g_win32_get_package_installation_directory_of_module (NULL); - - if (install_dir) { - locale_dir = g_build_filename (install_dir, - "share", "locale", NULL); - retval = g_win32_locale_filename_from_utf8 (locale_dir); - g_free (install_dir); - g_free (locale_dir); - } - - if (retval) - return retval; - else - return g_strdup (""); -#else - return g_strdup (GNOMELOCALEDIR); -#endif -} - gint main (gint argc, gchar **argv) { @@ -166,9 +136,7 @@ main (gint argc, gchar **argv) #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - gchar *tmp = ev_previewer_get_locale_dir (); - bindtextdomain (GETTEXT_PACKAGE, tmp); - g_free (tmp); + bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir()); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif