File evince-hibgit-locale.patch of Package mingw32-evince

Overview Repositories Revisions Requests Users Attributes Meta

File evince-hibgit-locale.patch of Package mingw32-evince (Revision cc9da73c8724335e55bd7108ccea207a)

Currently displaying revision cc9da73c8724335e55bd7108ccea207a , Show latest

From 43f695a026296ac2ab786550b8c1df3fad4c9fd7 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Mon, 17 May 2010 11:38:16 +0200
Subject: [PATCH] [windows] Fix localization on Windows

diff --git a/libdocument/ev-init.c b/libdocument/ev-init.c
index 2b247eb..9bac955 100644
--- a/libdocument/ev-init.c
+++ b/libdocument/ev-init.c
@@ -21,6 +21,9 @@
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
 
 #include "ev-init.h"
 #include "ev-backends-manager.h"
@@ -29,6 +32,63 @@
 
 static int ev_init_count;
 
+#ifdef G_OS_WIN32
+
+static HMODULE evdocument_dll = NULL;
+static gchar *locale_dir = NULL;
+
+#ifdef DLL_EXPORT
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+	 DWORD     fdwReason,
+	 LPVOID    lpvReserved)
+{
+	if (fdwReason == DLL_PROCESS_ATTACH)
+		evdocument_dll = hinstDLL;
+
+	return TRUE;
+}
+#endif
+
+static const gchar *
+_ev_win32_get_locale_dir (HMODULE module)
+{
+	if (locale_dir)
+		return locale_dir;
+
+	gchar *install_dir = NULL, *utf8_locale_dir;
+	gchar *retval = NULL;
+
+	if (evdocument_dll != NULL)
+		install_dir =
+		g_win32_get_package_installation_directory_of_module (module);
+
+	if (install_dir) {
+		utf8_locale_dir = g_build_filename (install_dir,
+			"share", "locale", NULL);
+
+		locale_dir = g_win32_locale_filename_from_utf8 (utf8_locale_dir);
+
+		g_free (install_dir);
+		g_free (utf8_locale_dir);
+	}
+
+	if (!locale_dir)
+		locale_dir = g_strdup ("");
+}
+
+#endif
+
+const gchar *
+ev_get_locale_dir (void)
+{
+#ifdef G_OS_WIN32
+	return _ev_win32_get_locale_dir (evdocument_dll);
+#else
+	return GNOMELOCALEDIR;
+#endif
+}
+
 /**
  * ev_init:
  *
@@ -49,7 +109,7 @@ ev_init (void)
                 return have_backends;
 
 	/* set up translation catalog */
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir ());
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
         _ev_debug_init ();
@@ -72,6 +132,11 @@ ev_shutdown (void)
         if (--ev_init_count > 0)
                 return;
 
+#ifdef G_OS_WIN32
+	if (locale_dir != NULL)
+		g_free(locale_dir);
+#endif
+
         _ev_backends_manager_shutdown ();
         _ev_file_helpers_shutdown ();
         _ev_debug_shutdown ();
diff --git a/libdocument/ev-init.h b/libdocument/ev-init.h
index 00560a4..046ee9b 100644
--- a/libdocument/ev-init.h
+++ b/libdocument/ev-init.h
@@ -28,6 +28,8 @@
 
 G_BEGIN_DECLS
 
+const gchar* ev_get_locale_dir (void);
+
 gboolean    ev_init           (void);
 
 void        ev_shutdown       (void);
diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index ea5296e..da0706c 100644
--- a/previewer/Makefile.am
+++ b/previewer/Makefile.am
@@ -13,7 +13,6 @@ evince_previewer_CPPFLAGS = \
         -I$(top_srcdir)/libdocument             \
         -I$(top_srcdir)/libview                 \
 	-I$(top_srcdir)/libmisc			\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	$(AM_CPPFLAGS)
 
 evince_previewer_CFLAGS = \
diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c
index 990a003..2b8dea3 100644
--- a/previewer/ev-previewer.c
+++ b/previewer/ev-previewer.c
@@ -139,7 +139,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
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 16f3034..392e91c 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES=							\
 	-I$(top_builddir)/libview				\
 	-I$(top_srcdir)/libmisc					\
 	-I$(top_srcdir)/properties				\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
 	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
diff --git a/shell/main.c b/shell/main.c
index 620cba4..77732a9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -264,7 +264,7 @@ main (int argc, char *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
-- 
1.6.4.2

Places

File evince-hibgit-locale.patch of Package mingw32-evince (Revision cc9da73c8724335e55bd7108ccea207a)

Places