aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMichael Meeks <mmeeks@src.gnome.org>2000-09-17 00:37:07 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-09-17 00:37:07 +0800
commit4f04a07954d6d577dfd99fbb85fe60db5873d137 (patch)
tree243a4ff3a25c323b9f9c22e8157763649d7ceb06 /calendar
parentfa1d9f97dfd8ba2a6ba97dbb23d681441b794d74 (diff)
downloadgsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.gz
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.bz2
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.lz
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.xz
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.tar.zst
gsoc2013-evolution-4f04a07954d6d577dfd99fbb85fe60db5873d137.zip
Everywhere add a -DEVOLUTION_DATADIR=${datadir} in the Makefile.am
And use this in grabbing the ui from the xml file. Requires HEAD bonobo. svn path=/trunk/; revision=5474
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/calendar-commands.c3
3 files changed, 9 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 40a65c7539..9df9705ffd 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-16 Michael Meeks <michael@helixcode.com>
+
+ * gui/Makefile.am (INCLUDES): add datadir
+
+ * gui/calendar-commands.c (calendar_control_activate): use it.
+
2000-09-14 JP Rosevear <jpr@helixcode.com>
* conduits/todo/.cvsignore: Shush
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 26de95f324..37a1aa3259 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -18,6 +18,7 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(includedir) \
$(BONOBO_VFS_GNOME_CFLAGS) \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 9f9b58aa7f..cef814a36f 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -593,7 +593,8 @@ calendar_control_activate (BonoboControl *control,
container = bonobo_ui_compat_get_container (uih);
g_return_if_fail (container != CORBA_OBJECT_NIL);
- fname = bonobo_ui_util_get_ui_fname ("evolution-calendar.xml");
+ fname = bonobo_ui_util_get_ui_fname (
+ EVOLUTION_DATADIR, "evolution-calendar.xml");
g_warning ("Attempting ui load from '%s'", fname);
ui = bonobo_ui_util_new_ui (component, fname, "evolution-calendar");