diff options
| author | Bharath Acharya <abharath@novell.com> | 2008-10-10 17:43:51 +0800 |
|---|---|---|
| committer | Bharath Acharya <abharath@src.gnome.org> | 2008-10-10 17:43:51 +0800 |
| commit | c70c47402a10dba0f5df8116b3d449ec18f9a786 (patch) | |
| tree | 564292520ba2c1b289c683ec2fe7825aaa54209e | |
| parent | ec4e26f3ebc18fc86658e113ae8560573b7b6da6 (diff) | |
| download | gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.tar gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.tar.gz gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.tar.bz2 gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.tar.lz gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.tar.xz gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.tar.zst gsoc2013-evolution-c70c47402a10dba0f5df8116b3d449ec18f9a786.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=/branches/gnome-2-24/; revision=36588
| -rw-r--r-- | composer/ChangeLog | 8 | ||||
| -rw-r--r-- | composer/e-composer-private.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 48d15cdf3d..8f592f87ec 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); |