aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBharath Acharya <abharath@novell.com>2008-10-10 17:42:29 +0800
committerBharath Acharya <abharath@src.gnome.org>2008-10-10 17:42:29 +0800
commitf1d75515a8e5378a586406a8f7c51fbfbe25c754 (patch)
tree95f3cc2282f9ccf04fdb534b0e8f742c82cbc88c
parent816eb7545078d43caeba865ed1a5822555cd31a8 (diff)
downloadgsoc2013-evolution-f1d75515a8e5378a586406a8f7c51fbfbe25c754.tar.gz
gsoc2013-evolution-f1d75515a8e5378a586406a8f7c51fbfbe25c754.tar.zst
gsoc2013-evolution-f1d75515a8e5378a586406a8f7c51fbfbe25c754.zip
** Fix for bug #555775
2008-10-10 Bharath Acharya <abharath@novell.com> ** Fix for bug #555775 * e-composer-private.c: (e_composer_private_init): Include e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and build the filename using it. svn path=/trunk/; revision=36587
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-composer-private.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 315580b45c..dbab4329ca 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-10 Bharath Acharya <abharath@novell.com>
+
+ ** Fix for bug #555775
+
+ * e-composer-private.c: (e_composer_private_init): Include
+ e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and build
+ the filename using it.
+
2008-10-03 Milan Crha <mcrha@redhat.com>
** Fix for bug #554664
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 30cdbfab75..866867879f 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -18,6 +18,7 @@
*/
#include "e-composer-private.h"
+#include "e-util/e-util-private.h"
static void
composer_setup_charset_menu (EMsgComposer *composer)
@@ -118,7 +119,7 @@ e_composer_private_init (EMsgComposer *composer)
e_composer_actions_init (composer);
- filename = e_composer_find_data_file ("evolution-composer.ui");
+ filename = g_build_filename (EVOLUTION_UIDIR, "evolution-composer.ui", NULL);
gtk_ui_manager_add_ui_from_file (manager, filename, &error);
g_free (filename);