aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog9
-rw-r--r--composer/Makefile.am7
-rw-r--r--composer/e-msg-composer.c2
3 files changed, 13 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 3fa2714345..689683c47a 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-16 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-msg-composer.c (setup_ui): Get evolution-message-composer.xml
+ from EVOLUTION_UI_DIRECTORY.
+
+ * Makefile.am (gladedir): Version it using $(BASE_VERSION).
+ (iconsdir): Likewise.
+ (libcomposerincludedir): Removed.
+
2003-01-17 Jeffrey Stedfast <fejj@ximian.com>
* evolution-composer.c (impl_Composer_set_headers): Updated to use
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 1be151bb80..106e03b62c 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -44,13 +44,11 @@ $(libcomposer_la_OBJECTS): composer-marshal.h
idl_DATA = $(IDLS)
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = \
e-msg-composer-attachment.glade
-iconsdir = $(datadir)/evolution/images
-
-libcomposerincludedir = $(includedir)/composer
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
noinst_LIBRARIES = libcomposer.a
@@ -68,6 +66,7 @@ INCLUDES = \
-I$(top_srcdir)/shell \
-DEVOLUTION_DATADIR=\"$(datadir)\" \
-DEVOLUTION_ICONSDIR=\"$(iconsdir)\" \
+ -DEVOLUTION_UIDIR=\"$(evolutionuidir)\" \
-DE_GLADEDIR=\"$(gladedir)\" \
-DG_LOG_DOMAIN=\"composer\" \
-DG_DISABLE_DEPRECATED \
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5abda1e209..553e99a6de 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2026,7 +2026,7 @@ setup_ui (EMsgComposer *composer)
bonobo_ui_component_freeze (composer->uic, NULL);
bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,
- "evolution-message-composer.xml",
+ EVOLUTION_UIDIR "/evolution-message-composer.xml",
"evolution-message-composer", NULL);
e_pixmaps_update (composer->uic, pixcache);