aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-01-05 07:52:38 +0800
committerTor Lillqvist <tml@src.gnome.org>2006-01-05 07:52:38 +0800
commite35c5c7beaa369c6a4e38f5f93cc9676bee29063 (patch)
tree82314998c437d64ecbecd09c3320edd7381b27de
parentdd89eedfbfd41ee781a10b565b5ea0e8a6472b5d (diff)
downloadgsoc2013-evolution-e35c5c7beaa369c6a4e38f5f93cc9676bee29063.tar.gz
gsoc2013-evolution-e35c5c7beaa369c6a4e38f5f93cc9676bee29063.tar.zst
gsoc2013-evolution-e35c5c7beaa369c6a4e38f5f93cc9676bee29063.zip
e-plugin.c (epl_construct) [Win32] The interface of
2006-01-05 Tor Lillqvist <tml@novell.com> * e-plugin.c (epl_construct) * e-menu.c (emph_construct_menu): [Win32] The interface of e_util_replace_prefix() changed a bit. svn path=/trunk/; revision=31053
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-menu.c6
-rw-r--r--e-util/e-plugin.c6
3 files changed, 14 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index c368e99af9..48f9a06486 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-05 Tor Lillqvist <tml@novell.com>
+
+ * e-plugin.c (epl_construct)
+ * e-menu.c (emph_construct_menu): [Win32] The interface of
+ e_util_replace_prefix() changed a bit.
+
2006-01-02 Tor Lillqvist <tml@novell.com>
* e-menu.c (emph_construct_menu): Don't eventually free a return
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index a19197ba7a..68bf71866e 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -789,8 +789,10 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root)
xmlFree(tmp);
#ifdef G_OS_WIN32
{
- char *mapped_location = e_util_replace_prefix (e_util_get_prefix (),
- ui->filename);
+ char *mapped_location =
+ e_util_replace_prefix (EVOLUTION_PREFIX,
+ e_util_get_prefix (),
+ ui->filename);
g_free (ui->filename);
ui->filename = mapped_location;
}
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index c46bdebf44..762ab51afe 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -877,8 +877,10 @@ epl_construct(EPlugin *ep, xmlNodePtr root)
}
#ifdef G_OS_WIN32
{
- char *mapped_location = e_util_replace_prefix (e_util_get_prefix (),
- epl->location);
+ char *mapped_location =
+ e_util_replace_prefix (EVOLUTION_PREFIX,
+ e_util_get_prefix (),
+ epl->location);
g_free (epl->location);
epl->location = mapped_location;
}