From ebb44eb8cce238c3e981f40e02cd349659434857 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 15 Jun 2006 10:18:36 +0000 Subject: On Win32, if the compile-time localedir's prefix from the plugin's .eplug 2006-06-15 Tor Lillqvist * e-plugin.c (ep_construct): On Win32, if the compile-time localedir's prefix from the plugin's .eplug file matches Evolution's compile-time prefix, replace it with the run-time prefix (installation directory). svn path=/trunk/; revision=32150 --- e-util/ChangeLog | 7 +++++++ e-util/e-plugin.c | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 0fbcf9df6b..e3a2fffeac 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2006-06-15 Tor Lillqvist + + * e-plugin.c (ep_construct): On Win32, if the compile-time + localedir's prefix from the plugin's .eplug file matches + Evolution's compile-time prefix, replace it with the run-time + prefix (installation directory). + 2006-06-09 Chris Heath * e-plugin.c (ep_construct): Fix memory leak. diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index d565c498a0..b645524569 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -145,6 +145,14 @@ ep_construct(EPlugin *ep, xmlNodePtr root) ep->domain = e_plugin_xml_prop(root, "domain"); if (ep->domain && (localedir = e_plugin_xml_prop(root, "localedir"))) { +#ifdef G_OS_WIN32 + char *mapped_localedir = + e_util_replace_prefix (EVOLUTION_PREFIX, + e_util_get_prefix (), + localedir); + g_free (localedir); + localedir = mapped_localedir; +#endif bindtextdomain(ep->domain, localedir); g_free(localedir); } -- cgit v1.2.3