[build] Rename DATADIR with EVINCEDATADIR

[evince.git] / previewer / ev-previewer.c

diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c
index 0331766f179f254c6ce4f3b391dfc1c58cf58df5..50290798575cf0e2f09cf4fc40673d768e9bac55 100644 (file)
--- 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 <io.h>
 #include <conio.h>
 #if !(_WIN32_WINNT >= 0x0500)
@@ -86,8 +83,12 @@ ev_previewer_load_document (const gchar     *filename,
 {
        EvJob *job;
        gchar *uri;
+       GFile  *file;
+
+       file = g_file_new_for_commandline_arg (filename);
+       uri = g_file_get_uri (file);
+       g_object_unref (file);
 
-       uri = g_filename_to_uri (filename, NULL, NULL);
        job = ev_job_load_new (uri);
        g_signal_connect (job, "finished",
                          G_CALLBACK (ev_previewer_load_job_finished),
@@ -135,7 +136,7 @@ main (gint argc, gchar **argv)
 
 #ifdef ENABLE_NLS
        /* Initialize the i18n stuff */
-       bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir());
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 #endif