aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-04-19 01:46:26 +0800
committerRodney Dawes <dobey@src.gnome.org>2003-04-19 01:46:26 +0800
commit1bd3678dbeb2a9b1094e346ef0164ba8b35151cd (patch)
treef8cda95446c857c24d418d4a35d6edf470614949 /composer
parent3a26734567f7e76f76e31313744f504e8abbff15 (diff)
downloadgsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.gz
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.bz2
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.lz
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.xz
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.zst
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.zip
[ fixes #21499 ]
2003-04-18 Rodney Dawes <dobey@ximian.com> [ fixes #21499 ] * gui/component/Makefile.am: * gui/component/addressbook.c: * gui/component/select-names/e-select-names-bonobo.c: * gui/contact-editor/Makefile.am: * gui/contact-editor/e-contact-editor.c: * gui/contact-list-editor/Makefile.am: * gui/contact-list-editor/e-contact-list-editor.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () * gui/Makefile.am: * gui/calendar-commands.c: * gui/tasks-control.c: * gui/dialogs/Makefile.am: * gui/dialogs/comp-editor.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () * Makefile.am: * e-msg-composer.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui (). Fixes bug #21499. * Makefile.am: * folder-browser-ui.c: * mail-signature-editor.c: * message-browser.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui (). Fixes bug #21499. * Makefile.am: * e-summary-factory.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () * e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () [#21499] svn path=/trunk/; revision=20888
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/Makefile.am1
-rw-r--r--composer/e-msg-composer.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 0183e454cd..443dc2947a 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-18 Rodney Dawes <dobey@ximian.com>
+
+ * Makefile.am:
+ * e-msg-composer.c:
+ Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
+ Fixes bug #21499.
+
2003-04-14 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment.c (file_name_focus_out_cb): Return
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 3c12e877a2..f605c116f3 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -65,6 +65,7 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\"$(imagesdir)\" \
-DEVOLUTION_UIDIR=\"$(evolutionuidir)\" \
-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
+ -DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\"composer\" \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index aeabea9028..71ea78e419 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2086,7 +2086,7 @@ setup_ui (EMsgComposer *composer)
bonobo_ui_component_freeze (composer->uic, NULL);
- bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,
+ bonobo_ui_util_set_ui (composer->uic, PREFIX,
EVOLUTION_UIDIR "/evolution-message-composer.xml",
"evolution-message-composer", NULL);