aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/GNOME_Evolution_Shell.server.in.in (renamed from shell/GNOME_Evolution_Shell.server.in)2
-rw-r--r--shell/Makefile.am6
-rw-r--r--shell/e-shell.c4
4 files changed, 17 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d0fdf4e641..ec585ad2af 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,15 @@
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
+ * Makefile.am: Added rule to generate
+ GNOME_Evolution_Shell.server.in from
+ GNOME_Evolution_Shell.server.in.in, substituting @BINDIR@.
+
+ * GNOME_Evolution_Shell.server.in.in: Renamed from
+ GNOME_Evolution_Shell.server.in. Prepend @BINDIR@ to the location
+ of the executable.
+
+2002-11-15 Ettore Perazzoli <ettore@ximian.com>
+
* evolution-storage.c (impl_finalize): Fix typo; p -> sp.
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
diff --git a/shell/GNOME_Evolution_Shell.server.in b/shell/GNOME_Evolution_Shell.server.in.in
index 54d80530d9..0dbeb6f8bb 100644
--- a/shell/GNOME_Evolution_Shell.server.in
+++ b/shell/GNOME_Evolution_Shell.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Shell"
type="exe"
- location="evolution">
+ location="@BINDIR@/evolution">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/Shell:1.0"/>
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 81ad69cec4..838e582237 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -255,8 +255,10 @@ install-test-component: evolution-test-component
# Misc stuff
serverdir = $(libdir)/bonobo/servers
-server_in_files = GNOME_Evolution_Shell.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+server_in_files = GNOME_Evolution_Shell.server.in.in
+server_DATA = $(server_in_files:.server.in.in=.server)
+$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+ sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
etspecdir = $(datadir)/evolution/etspec/
etspec_DATA = \
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a02cc1e89b..36b14f4d2b 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -961,14 +961,14 @@ notify_no_views_left_idle_cb (void *data)
{
EShell *shell;
- puts (__FUNCTION__);
-
shell = E_SHELL (data);
set_interactive (shell, FALSE);
bonobo_object_ref (BONOBO_OBJECT (shell));
+
g_signal_emit (shell, signals [NO_VIEWS_LEFT], 0);
+
bonobo_object_unref (BONOBO_OBJECT (shell));
return FALSE;