aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorBharath Acharya <abharath@novell.com>2008-10-13 11:31:48 +0800
committerBharath Acharya <abharath@src.gnome.org>2008-10-13 11:31:48 +0800
commitf2bbac0d5fb3e3354e29c815c8d8ed05a6a70071 (patch)
treed99b0a05352b863543befcc248cd328bd582332b /composer
parent957a96c10aa8385472205a7854ffa94e56750ae8 (diff)
downloadgsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.tar
gsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.tar.gz
gsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.tar.bz2
gsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.tar.lz
gsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.tar.xz
gsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.tar.zst
gsoc2013-evolution-f2bbac0d5fb3e3354e29c815c8d8ed05a6a70071.zip
** Updated fix for bug #555775
2008-10-13 Bharath Acharya <abharath@novell.com> ** Updated fix for bug #555775 * e-composer-private.c: (e_composer_private_init): Reverting a hunk from the previous patch as suggested by Matthew Barnes. svn path=/trunk/; revision=36605
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-composer-private.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index dbab4329ca..cbc01d7bb4 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-13 Bharath Acharya <abharath@novell.com>
+
+ ** Updated fix for bug #555775
+
+ * e-composer-private.c: (e_composer_private_init): Reverting a hunk
+ from the previous patch as suggested by Matthew Barnes.
+
2008-10-10 Bharath Acharya <abharath@novell.com>
** Fix for bug #555775
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 866867879f..490e6c917e 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -119,7 +119,7 @@ e_composer_private_init (EMsgComposer *composer)
e_composer_actions_init (composer);
- filename = g_build_filename (EVOLUTION_UIDIR, "evolution-composer.ui", NULL);
+ filename = e_composer_find_data_file ("evolution-composer.ui");
gtk_ui_manager_add_ui_from_file (manager, filename, &error);
g_free (filename);