aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-06-15 18:18:36 +0800
committerTor Lillqvist <tml@src.gnome.org>2006-06-15 18:18:36 +0800
commitebb44eb8cce238c3e981f40e02cd349659434857 (patch)
treed625e1a88c170ea4be092cd178b8533e1e10b4b2 /e-util
parentc520728ac008ebab9a095460e68e2d07f689affe (diff)
downloadgsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.tar
gsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.tar.gz
gsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.tar.bz2
gsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.tar.lz
gsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.tar.xz
gsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.tar.zst
gsoc2013-evolution-ebb44eb8cce238c3e981f40e02cd349659434857.zip
On Win32, if the compile-time localedir's prefix from the plugin's .eplug
2006-06-15 Tor Lillqvist <tml@novell.com> * 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
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog7
-rw-r--r--e-util/e-plugin.c8
2 files changed, 15 insertions, 0 deletions
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 <tml@novell.com>
+
+ * 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 <chris@heathens.co.nz>
* 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);
}