diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:25:15 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:25:15 +0800 |
| commit | 9d14474e02c1064bc58f29376565a2446c99f99c (patch) | |
| tree | deb8a7e397feee1e102770841e1800f90c6e6d3c /shell/e-shell-view.c | |
| parent | 62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15 (diff) | |
| download | gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.gz gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.bz2 gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.lz gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.xz gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.zst gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.zip | |
Install the shell executable as evolution-$(BASE_VERSION) using an
* Makefile.am: Install the shell executable as
evolution-$(BASE_VERSION) using an install-exec-local hack. Also
put libeshell in $(privlibdir) instead of $(libdir).
(eshellincludedir): Version using $(BASE_VERSION).
(INCLUDES): Update for the new locations of things.
(etspecdir): Likewise.
* e-shell-view.c (e_shell_view_construct): Get evolution.xml from
EVOLUTION_UIDIR.
* importer/Makefile.am: Install libevolution-importer in
$(privlibdir) instead of $(libdir).
(INCLUDES): Updated for the new versioned paths. Define
EVOLUTION_UIDIR.
(libevolution_importerincludedir): Version using $(BASE_VERSION).
(gladedir): Likewise.
* glade/Makefile.am (gladedir): Version using $(BASE_VERSION).
* e-setup.c (DEFAULT_USER_PATH): New #define.
(check_evolution_directory): Use it.
(copy_default_stuff): Likewise. Also, remove old shortcuts.xml
removal cruft.
svn path=/trunk/; revision=19565
Diffstat (limited to 'shell/e-shell-view.c')
| -rw-r--r-- | shell/e-shell-view.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 426ceb0750..6ce2098eb8 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1784,7 +1784,9 @@ e_shell_view_construct (EShellView *shell_view, bonobo_ui_component_freeze (priv->ui_component, NULL); - bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR, "evolution.xml", "evolution", NULL); + bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR, + EVOLUTION_UIDIR "/evolution.xml", + "evolution", NULL); setup_widgets (shell_view); |