X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=7d4fb0d317b723f8e713a2deaa8a23b3a6b93e0d;hb=d3cccc847296bcdfc4fb9b99ac72de0dd640d681;hp=4ed0b05ebd42067d934d64b144599ba637c43df7;hpb=61c9b15fa57e40c9561ae8d5ca13228d4e7a897a;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 4ed0b05e..7d4fb0d3 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -41,9 +41,6 @@
 #endif /* WITH_SMCLIENT */
 
 #ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
 #include <io.h>
 #include <conio.h>
 #if !(_WIN32_WINNT >= 0x0500)
@@ -232,33 +229,6 @@ load_files (const char **files)
         }
 }
 
-static gchar*
-ev_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
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -296,9 +266,7 @@ main (int argc, char *argv[])
 
 #ifdef ENABLE_NLS
 	/* Initialize the i18n stuff */
-	gchar *tmp = ev_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