From 44f482262c0154e373c9efee52ae79ca871438db Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 15 Nov 2002 22:06:22 +0000
Subject: Added rule to generate GNOME_Evolution_Shell.server.in from

* 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.

svn path=/trunk/; revision=18792
---
 shell/ChangeLog                          | 10 +++++++
 shell/GNOME_Evolution_Shell.server.in    | 51 --------------------------------
 shell/GNOME_Evolution_Shell.server.in.in | 51 ++++++++++++++++++++++++++++++++
 shell/Makefile.am                        |  6 ++--
 shell/e-shell.c                          |  4 +--
 5 files changed, 67 insertions(+), 55 deletions(-)
 delete mode 100644 shell/GNOME_Evolution_Shell.server.in
 create mode 100644 shell/GNOME_Evolution_Shell.server.in.in

diff --git a/shell/ChangeLog b/shell/ChangeLog
index d0fdf4e641..ec585ad2af 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+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.
diff --git a/shell/GNOME_Evolution_Shell.server.in b/shell/GNOME_Evolution_Shell.server.in
deleted file mode 100644
index 54d80530d9..0000000000
--- a/shell/GNOME_Evolution_Shell.server.in
+++ /dev/null
@@ -1,51 +0,0 @@
-<oaf_info>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell"
-	      type="exe"
-	      location="evolution">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/Shell:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="The Evolution shell."/>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory"
-	      type="exe"
-	      location="evolution-exchange-storage">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Shell_Config_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:title" type="string"
-		   _value="Folder Settings"/>
-
-    <oaf_attribute name="evolution:config_item:description" type="string"
-		   _value="Configure special folders and offline folder behavior here"/>
-
-    <oaf_attribute name="evolution:config_item:icon_name" type="string"
-		   value="folder-settings.png"/>
-
-    <oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/>
-
-    <oaf_attribute name="evolution:config_item:type" type="stringv">
-      <item value="shell"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for Evolution folder settings."/>
-  </oaf_server>
-
-</oaf_info>
diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in
new file mode 100644
index 0000000000..0dbeb6f8bb
--- /dev/null
+++ b/shell/GNOME_Evolution_Shell.server.in.in
@@ -0,0 +1,51 @@
+<oaf_info>
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_Shell"
+	      type="exe"
+	      location="@BINDIR@/evolution">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/Evolution/Shell:1.0"/>
+    </oaf_attribute>
+
+    <oaf_attribute name="description" type="string"
+		   _value="The Evolution shell."/>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory"
+	      type="exe"
+	      location="evolution-exchange-storage">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/GenericFactory:1.0"/>
+    </oaf_attribute>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control"
+	      type="factory"
+	      location="OAFIID:GNOME_Evolution_Shell_Config_Factory">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
+    </oaf_attribute>
+
+    <oaf_attribute name="evolution:config_item:title" type="string"
+		   _value="Folder Settings"/>
+
+    <oaf_attribute name="evolution:config_item:description" type="string"
+		   _value="Configure special folders and offline folder behavior here"/>
+
+    <oaf_attribute name="evolution:config_item:icon_name" type="string"
+		   value="folder-settings.png"/>
+
+    <oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/>
+
+    <oaf_attribute name="evolution:config_item:type" type="stringv">
+      <item value="shell"/>
+    </oaf_attribute>
+
+    <oaf_attribute name="description" type="string"
+		   _value="Configuration control for Evolution folder settings."/>
+  </oaf_server>
+
+</oaf_info>
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;
-- 
cgit v1.2.3