From f1d75515a8e5378a586406a8f7c51fbfbe25c754 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Fri, 10 Oct 2008 09:42:29 +0000 Subject: ** Fix for bug #555775 2008-10-10 Bharath Acharya ** 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 --- composer/ChangeLog | 8 ++++++++ composer/e-composer-private.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 + + ** 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 ** 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); -- cgit v1.2.3