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 /shell | |
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 'shell')
-rw-r--r-- | shell/ChangeLog | 4 | ||||
-rw-r--r-- | shell/e-shell-view-menu.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 252ea07ca3..4f0936875d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2000-09-16 Michael Meeks <michael@helixcode.com> + + * e-shell-view-menu.c (e_shell_view_menu_setup): use datadir. + 2000-09-16 Ettore Perazzoli <ettore@helixcode.com> * e-shell-view.h: #include "bonobo-win.h", not "bonobo-app.h". diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 351c7b6231..0d7c992292 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -457,7 +457,8 @@ e_shell_view_menu_setup (EShellView *shell_view) bonobo_ui_container_freeze (container, NULL); - fname = bonobo_ui_util_get_ui_fname ("evolution.xml"); + fname = bonobo_ui_util_get_ui_fname ( + EVOLUTION_DATADIR, "evolution.xml"); g_warning ("Attempting ui load from '%s'", fname); ui = bonobo_ui_util_new_ui (component, fname, "evolution"); |