aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/GNOME_Evolution_Shell.server.in.in10
-rw-r--r--shell/Makefile.am5
-rw-r--r--shell/main.c11
4 files changed, 32 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7b368142e5..b3266618b9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-07 Dan Winship <danw@ximian.com>
+
+ * Makefile.am ($(server_in_files)): Substitute version number into
+ the evolution binary name in the server file
+ (INCLUDES): define EVOLUTION_TOOLSDIR
+
+ * GNOME_Evolution_Shell.server.in.in: Clean up server names. Add
+ "-@VERSION@" to the end of the shell binary name
+
+ * main.c (main): if KILL_PROCESS_CMD is defined, add a
+ --force-shutdown argument that runs killev and exits.
+
2003-04-07 Not Zed <NotZed@Ximian.com>
[#40536]
diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in
index 0dbeb6f8bb..960ae4ee07 100644
--- a/shell/GNOME_Evolution_Shell.server.in.in
+++ b/shell/GNOME_Evolution_Shell.server.in.in
@@ -2,14 +2,14 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Shell"
type="exe"
- location="@BINDIR@/evolution">
+ location="@BINDIR@/evolution-@VERSION@">
<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_attribute name="name" type="string"
+ _value="Evolution Shell"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory"
@@ -44,8 +44,8 @@
<item value="shell"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Configuration control for Evolution folder settings."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution folder settings configuration control"/>
</oaf_server>
</oaf_info>
diff --git a/shell/Makefile.am b/shell/Makefile.am
index defd6266c3..5fc76a57f5 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
@@ -289,7 +290,9 @@ install-test-component: evolution-test-component
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)|" $< > $@
+ sed -e "s|\@BINDIR\@|$(bindir)|" \
+ -e "s|\@VERSION\@|$(BASE_VERSION)|" \
+ $< > $@
etspec_DATA = e-storage-set-view.etspec
diff --git a/shell/main.c b/shell/main.c
index 8aa3b9b79a..db04513a5c 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -86,6 +86,7 @@ static gboolean no_splash = FALSE;
static gboolean start_online = FALSE;
static gboolean start_offline = FALSE;
static gboolean force_upgrade = FALSE;
+static gboolean killev = FALSE;
extern char *evolution_debug_log;
@@ -528,6 +529,10 @@ main (int argc, char **argv)
N_("Start in offline mode"), NULL },
{ "online", '\0', POPT_ARG_NONE, &start_online, 0,
N_("Start in online mode"), NULL },
+#ifdef KILL_PROCESS_CMD
+ { "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0,
+ N_("Forcibly shut down all evolution components"), NULL },
+#endif
{ "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0,
N_("Send the debugging output of all components to a file."), NULL },
#if 0
@@ -562,6 +567,12 @@ main (int argc, char **argv)
exit (1);
}
+ if (killev) {
+ execl (EVOLUTION_TOOLSDIR "/killev", "killev", NULL);
+ /* Not reached */
+ exit (0);
+ }
+
setup_segv_redirect ();
if (evolution_debug_log) {