diff options
| author | Michael Meeks <mmeeks@src.gnome.org> | 2000-09-17 00:37:07 +0800 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-09-17 00:37:07 +0800 |
| commit | 4f04a07954d6d577dfd99fbb85fe60db5873d137 (patch) | |
| tree | 243a4ff3a25c323b9f9c22e8157763649d7ceb06 /mail | |
| parent | fa1d9f97dfd8ba2a6ba97dbb23d681441b794d74 (diff) | |
| download | gsoc2013-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 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 2b72b91d2f..adf62d1e0d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2000-09-16 Michael Meeks <michael@helixcode.com> + + * Makefile.am (INCLUDES): add datadir + + * folder-browser-factory.c (control_activate): use it. + 2000-09-15 Dan Winship <danw@helixcode.com> * mail-callbacks.c (transfer_msg): Revert **Temp fix** from below diff --git a/mail/Makefile.am b/mail/Makefile.am index a0b935c612..d7a8518e9d 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -16,6 +16,7 @@ INCLUDES = \ $(UNICODE_CFLAGS) \ $(GTKHTML_CFLAGS) \ -DEVOLUTION_VERSION=\""$(VERSION)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \ diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 13fc4eafa2..56a7f4952d 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -187,7 +187,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, char *fname; xmlNode *ui; - fname = bonobo_ui_util_get_ui_fname ("evolution-mail.xml"); + fname = bonobo_ui_util_get_ui_fname ( + EVOLUTION_DATADIR, "evolution-mail.xml"); g_warning ("Attempting ui load from '%s'", fname); ui = bonobo_ui_util_new_ui (component, fname, "evolution-mail"); |