[evolution-patches] killev for 1.4

[Dan Winship <danw ximian com>]

The attached patches implement killev for 1.4, with exciting new
features.

        [danw twelve-monkeys danw]$ evolution-1.3 --force-shutdown
        Shutting down evolution-1.3 (Evolution Shell)
        Shutting down evolution-exchange-storage (Ximian Connector for Exchange / Evolution Calendar Exchange backend / Evolution Addressbook Exchange backend)
        Shutting down evolution-wombat (Evolution Calendar local file backend / Evolution Addressbook local/LDAP backend)
        Shutting down evolution-alarm-notify (Evolution Calendar alarm notification service)

Changes from 1.2:
      * Written in C because bonobo-activation-query doesn't output as
        much info as oaf-client, so there's no easy way to do killev as
        a wrapper around it.
      * Invoked as "evolution --force-shutdown", which sounds like a
        command that's safe to run if you want to shut down wombat and
        alarm-notify, but not so safe that you'd want to normally use it
        to quit evolution. Also, it doesn't require either putting an
        extra binary in $(bindir) or requiring the user to type the path
        to $(privlibexecdir) (which is where killev actually is).
      * Only prints a message for components that are actually running
      * Prints pretty names of components, with l10n
      * Always kills the shell first so you don't start to get "the blah
        blah blah was killed" dialogs.

The first patch is the new killev. The second patch fixes the shell's
server file and adds the --force-shutdown flag. The third standardizes
the name/description entries in the various server files so that the
pretty names are actually pretty.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1181
diff -u -r1.1181 ChangeLog
--- ChangeLog	4 Apr 2003 01:08:35 -0000	1.1181
+++ ChangeLog	4 Apr 2003 19:10:12 -0000
@@ -1,3 +1,20 @@
+2003-04-04  Dan Winship  <danw ximian com>
+
+	* tools/Makefile.am (privlibexec_SCRIPTS, privlibexec_PROGRAMS):
+	Install these in privlibexecdir, not privdatadir. Move killev from
+	SCRIPTS to PROGRAMS.
+	(killev_SOURCES, killev_LDADD): Add
+
+	* tools/killev.c: New C port of killev, since
+	"bonobo-activation-query" does not return as much information as
+	"oaf-client" did. Also has prettier output. (Still shells out to
+	killall/pkill to do the actual killing.)
+
+	* tools/killev: Gone
+
+	* tools/evolution-move-tasks: Removed since the evolution-calendar
+	code that called it is also gone now.
+
 2003-04-03  Chris Toshok  <toshok ximian com>
 
 	* acinclude.m4 (EVO_LDAP_CHECK): the existence of libldap.la
Index: tools/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/tools/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- tools/Makefile.am	28 Feb 2003 22:20:58 -0000	1.18
+++ tools/Makefile.am	4 Apr 2003 19:10:12 -0000
@@ -1,15 +1,13 @@
-toolsdir = $(privdatadir)/tools
-
-tools_SCRIPTS =				\
+privlibexec_SCRIPTS =			\
 	csv2vcard			\
-	evolution-move-tasks		\
-	evolution-addressbook-clean	\
-	killev
+	evolution-addressbook-clean
 
-tools_PROGRAMS =			\
+privlibexec_PROGRAMS =			\
 	evolution-addressbook-import	\
 	evolution-addressbook-export	\
-	evolution-launch-composer
+	evolution-launch-composer	\
+	killev
+
 
 noinst_PROGRAMS = evolution-addressbook-abuse
 
@@ -56,8 +54,8 @@
 evolution_addressbook_abuse_LDADD =				\
 	$(evolution_addressbook_import_LDADD)
 
-evolution_launch_composer_SOURCES =                     \
-        $(CORBA_SOURCE)                                 \
+evolution_launch_composer_SOURCES =				\
+        $(CORBA_SOURCE)						\
         evolution-launch-composer.c
 
 evolution_launch_composer_LDADD =                               \
@@ -65,11 +63,17 @@
         $(top_builddir)/addressbook/backend/ebook/libebook.la   \
         $(top_builddir)/widgets/menus/libmenus.la
 
-CLEANFILES = evolution-addressbook-clean $(BUILD_SOURCES)
+killev_SOURCES =						\
+	killev.c
+
+killev_LDADD =							\
+	$(top_builddir)/e-util/libeutil.la
+
+CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
 
 
 evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\ EVOLUTION_TOOLSDIR\@?$(toolsdir)?g' \
+	sed -e 's?\ EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \
 	   < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
 	  && mv evolution-addressbook-clean.tmp evolution-addressbook-clean
Index: tools/killev.c
===================================================================
RCS file: tools/killev.c
diff -N tools/killev.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/killev.c	4 Apr 2003 19:10:12 -0000
@@ -0,0 +1,217 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* killev.c
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+
+#include <bonobo/bonobo-exception.h>
+#include <bonobo-activation/bonobo-activation.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h>
+
+#include "e-util/e-lang-utils.h"
+
+typedef struct {
+	char *location;
+	GPtrArray *names;
+} KillevComponent;
+
+GSList *languages;
+GHashTable *components;
+
+static gboolean
+kill_process (const char *proc_name, KillevComponent *comp)
+{
+	int status, i;
+	char *command;
+	GString *desc;
+
+	command = g_strdup_printf (KILL_PROCESS_CMD " -0 %s 2> /dev/null",
+				   proc_name);
+	status = system (command);
+	g_free (command);
+
+	if (status == -1 || !WIFEXITED (status)) {
+		/* This most likely means that KILL_PROCESS_CMD wasn't
+		 * found, so just bail completely.
+		 */
+		fprintf (stderr, _("Could not execute '%s': %s\n"),
+			 KILL_PROCESS_CMD, strerror (errno));
+		exit (1);
+	}
+
+	if (WEXITSTATUS (status) != 0)
+		return FALSE;
+
+	desc = g_string_new (NULL);
+	for (i = 0; i < comp->names->len; i++) {
+		if (i > 0)
+			g_string_append (desc, " / ");
+		g_string_append (desc, comp->names->pdata[i]);
+	}
+
+	printf (_("Shutting down %s (%s)\n"), proc_name, desc->str);
+	g_string_free (desc, TRUE);
+	command = g_strdup_printf (KILL_PROCESS_CMD " -9 %s 2> /dev/null",
+				   proc_name);
+	system (command);
+	g_free (command);
+	return TRUE;
+};
+
+static gboolean
+kill_component (gpointer key, gpointer value, gpointer data)
+{
+	KillevComponent *comp = value;
+	char *exe_name;
+
+	if (kill_process (comp->location, comp))
+		return TRUE;
+
+	exe_name = g_strdup_printf ("lt-%s", comp->location);
+	if (kill_process (exe_name, comp)) {
+		g_free (exe_name);
+		return TRUE;
+	}
+
+	if (strlen (exe_name) > 16) {
+		exe_name[16] = '\0';
+		if (kill_process (exe_name, comp)) {
+			g_free (exe_name); 
+			return TRUE;
+		}
+	}
+	g_free (exe_name);
+
+	if (strlen (comp->location) > 16) {
+		exe_name = g_strndup (comp->location, 16);
+		kill_process (exe_name, comp);
+		g_free (exe_name);
+	}
+
+	return TRUE;
+}
+
+static void
+add_matching_query (const char *query)
+{
+	Bonobo_ServerInfoList *info_list;
+	Bonobo_ServerInfo *info;
+	CORBA_Environment ev;
+	const char *location, *name;
+	KillevComponent *comp;
+	int i;
+
+	CORBA_exception_init (&ev);
+
+	info_list = bonobo_activation_query (query, NULL, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		printf ("Bonobo activation failure: %s\n",
+			bonobo_exception_get_text (&ev));
+		CORBA_exception_free (&ev);
+		return;
+	}
+
+	for (i = 0; i < info_list->_length; i++) {
+		info = &info_list->_buffer[i];
+
+		if (strcmp (info->server_type, "exe") != 0)
+			continue;
+
+		location = info->location_info;
+		if (strchr (location, '/'))
+			location = strrchr (location, '/') + 1;
+
+		comp = g_hash_table_lookup (components, location);
+		if (!comp) {
+			comp = g_new (KillevComponent, 1);
+			comp->location = g_strdup (location);
+			comp->names = g_ptr_array_new ();
+			g_hash_table_insert (components, comp->location, comp);
+		}
+
+		name = bonobo_server_info_prop_lookup (info, "name", languages);
+		if (name)
+			g_ptr_array_add (comp->names, g_strdup (name));
+	}
+
+	CORBA_free (info_list);
+	CORBA_exception_free (&ev);
+}
+
+static void
+add_matching_repo_id (const char *repo_id)
+{
+	char *query;
+
+	query = g_strdup_printf ("repo_ids.has ('%s')", repo_id);
+	add_matching_query (query);
+	g_free (query);
+}
+
+static void
+add_matching_iid (const char *iid)
+{
+	char *query;
+
+	query = g_strdup_printf ("iid == '%s'", iid);
+	add_matching_query (query);
+	g_free (query);
+}
+
+int
+main (int argc, char **argv)
+{
+	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
+	gnome_program_init (PACKAGE, VERSION, LIBGNOME_MODULE, argc, argv, 
+			    GNOME_PROGRAM_STANDARD_PROPERTIES,
+			    NULL);
+
+	languages = e_get_language_list ();
+	components = g_hash_table_new (g_str_hash, g_str_equal);
+
+	add_matching_repo_id ("IDL:GNOME/Evolution/Shell:1.0");
+	g_hash_table_foreach_remove (components, kill_component, NULL);
+
+	add_matching_repo_id ("IDL:GNOME/Evolution/ShellComponent:1.0");
+	add_matching_repo_id ("IDL:GNOME/Evolution/Calendar/CalFactory:1.0");
+	add_matching_repo_id ("IDL:GNOME/Evolution/BookFactory:1.0");
+	add_matching_repo_id ("IDL:GNOME/Evolution/Importer:1.0");
+	add_matching_repo_id ("IDL:GNOME/Evolution/IntelligentImporter:1.0");
+	add_matching_repo_id ("IDL:GNOME/Spell/Checker:0.1");
+
+	add_matching_iid ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory");
+	add_matching_iid ("OAFIID:GNOME_GtkHTML_Editor_Factory:3.0");
+
+	g_hash_table_foreach_remove (components, kill_component, NULL);
+
+	return 0;
+}

Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1224
diff -u -r1.1224 ChangeLog
--- shell/ChangeLog	2 Apr 2003 16:34:01 -0000	1.1224
+++ shell/ChangeLog	4 Apr 2003 19:05:05 -0000
@@ -1,3 +1,15 @@
+2003-04-04  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-02  Rodrigo Moya <rodrigo ximian com>
 
 	* importer/GNOME_Evolution_Importer.idl:
Index: shell/GNOME_Evolution_Shell.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/shell/GNOME_Evolution_Shell.server.in.in,v
retrieving revision 1.1
diff -u -r1.1 GNOME_Evolution_Shell.server.in.in
--- shell/GNOME_Evolution_Shell.server.in.in	15 Nov 2002 22:06:22 -0000	1.1
+++ shell/GNOME_Evolution_Shell.server.in.in	4 Apr 2003 19:05:05 -0000
@@ -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>
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.150
diff -u -r1.150 Makefile.am
--- shell/Makefile.am	28 Mar 2003 21:52:31 -0000	1.150
+++ shell/Makefile.am	4 Apr 2003 19:05:05 -0000
@@ -14,6 +14,7 @@
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"		\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
 	-DDATADIR=\""$(datadir)"\"				\
@@ -289,7 +290,9 @@
 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
 
Index: shell/main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.117
diff -u -r1.117 main.c
--- shell/main.c	28 Mar 2003 21:52:31 -0000	1.117
+++ shell/main.c	4 Apr 2003 19:05:06 -0000
@@ -86,6 +86,7 @@
 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 @@
 		  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
@@ -560,6 +565,12 @@
 		fprintf (stderr, _("%s: --online and --offline cannot be used together.\n  Use %s --help for more information.\n"),
 			 argv[0], argv[0]);
 		exit (1);
+	}
+
+	if (killev) {
+		execl (EVOLUTION_TOOLSDIR "/killev", "killev", NULL);
+		/* Not reached */
+		exit (0);
 	}
 
 	setup_segv_redirect ();

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1370
diff -u -r1.1370 ChangeLog
--- addressbook/ChangeLog	3 Apr 2003 23:32:30 -0000	1.1370
+++ addressbook/ChangeLog	4 Apr 2003 19:04:43 -0000
@@ -1,3 +1,17 @@
+2003-04-04  Dan Winship  <danw ximian com>
+
+	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Clean up
+	server names.
+
+	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: 
+	Likewise
+
+	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
+	Likewise. Also mark the evolution:menu_name for i18n.
+
+	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
+	Likewise
+
 2003-04-03  Chris Toshok  <toshok ximian com>
 
 	* gui/widgets/e-minicard-label.c (e_minicard_label_event): set
Index: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
--- addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in	19 Mar 2003 20:28:18 -0000	1.2
+++ addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in	4 Apr 2003 19:04:43 -0000
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import LDIF files into Evolution."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution LDIF importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports LDIF files into Evolution."/>
+		       _value="LDAP Data Interchange Format (.ldif)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution LDIF importer"/>
 </oaf_server>
 
 </oaf_info>
Index: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
--- addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in	19 Mar 2003 20:28:18 -0000	1.2
+++ addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in	4 Apr 2003 19:04:43 -0000
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import VCard files into Evolution."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution VCard importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports VCard files into Evolution."/>
+		       _value="VCard (.vcf, .gcrd)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution VCard Importer"/>
 </oaf_server>
 
 </oaf_info>
Index: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Addressbook.server.in.in
--- addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in	6 Dec 2002 17:29:57 -0000	1.2
+++ addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in	4 Apr 2003 19:04:43 -0000
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the controls exported by the Evolution Addressbook"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook"/>
 
 </oaf_server>
 
@@ -28,9 +28,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               _value="Control that displays an Evolution addressbook minicard."/>
+		       _value="Evolution Addressbook card viewer"/>
 
 </oaf_server>
 
@@ -43,8 +41,8 @@
 		<item value="IDL:GNOME/Control:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="A sample Bonobo control which displays an addressbook."/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook folder viewer"/>
 
 </oaf_server>
 
@@ -56,8 +54,8 @@
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling contacts."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Addressbook component"/>
 
 	<oaf_attribute name="evolution:shell_component_icon" type="string"
 		       value="evolution-contacts.png"/>
@@ -75,8 +73,8 @@
 		<item value="IDL:GNOME/Control:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for displaying an address."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Addressbook address viewer"/>
 
 </oaf_server>
 
@@ -89,8 +87,8 @@
 		<item value="IDL:GNOME/Control:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for an address popup."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Addressbook address pop-up"/>
 
 </oaf_server>
 
@@ -117,8 +115,8 @@
 
 	<oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/>
     
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Addressbook Storages."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Addressbook LDAP Configuration Control"/>
 
 </oaf_server>
 
Index: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Addressbook_SelectNames.server.in.in
--- addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in	9 Jan 2003 19:17:00 -0000	1.2
+++ addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in	4 Apr 2003 19:04:43 -0000
@@ -9,8 +9,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook's name selection interface"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook name selection interface"/>
 
 </oaf_server>
 -->
@@ -23,8 +23,8 @@
 		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution's addressbook name selection interface."/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook name selection interface"/>
 
 </oaf_server>
 
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1706
diff -u -r1.1706 ChangeLog
--- calendar/ChangeLog	4 Apr 2003 17:37:01 -0000	1.1706
+++ calendar/ChangeLog	4 Apr 2003 19:04:48 -0000
@@ -1,5 +1,13 @@
 2003-04-04  Dan Winship  <danw ximian com>
 
+	* gui/GNOME_Evolution_Calendar.server.in.in: Clean up server names
+
+	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: 
+	Likewise
+
+	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
+	Likewise. Also mark the evolution:menu_name for i18n
+
 	* gui/e-itip-control.c (write_html): Don't free static string.
 
 2003-04-04  JP Rosevear  <jpr ximian com>
Index: calendar/gui/GNOME_Evolution_Calendar.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/GNOME_Evolution_Calendar.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Calendar.server.in.in
--- calendar/gui/GNOME_Evolution_Calendar.server.in.in	13 Jan 2003 21:15:24 -0000	1.2
+++ calendar/gui/GNOME_Evolution_Calendar.server.in.in	4 Apr 2003 19:04:48 -0000
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Evolution Calendar objects"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar and Tasks"/>
 
 </oaf_server>
 
@@ -28,7 +28,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       _value="Evolution calendar iTip/iMip viewer"/>
+		       _value="Evolution Calendar scheduling message viewer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
@@ -39,8 +39,8 @@
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling the calendar."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Calendar and Tasks component"/>
 
 	<oaf_attribute name="evolution:shell_component_icon" type="string"
 		       value="evolution-calendar.png"/>
@@ -62,8 +62,8 @@
 		<item value="text/calendar"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="A sample Bonobo control which displays an calendar."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Calendar viewer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
@@ -80,8 +80,8 @@
 		<item value="text/calendar"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="A Bonobo control which displays a task list."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Tasks viewer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
@@ -93,8 +93,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to centralize calendar component editor dialogs"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar/Task editor"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
@@ -121,8 +121,8 @@
 
 	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
     
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Calendar."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Calendar configuration control"/>
 
 </oaf_server>
 
Index: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in,v
retrieving revision 1.1
diff -u -r1.1 GNOME_Evolution_Calendar_AlarmNotify.server.in.in
--- calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in	7 Feb 2003 23:05:57 -0000	1.1
+++ calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in	4 Apr 2003 19:04:48 -0000
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the alarm notification service"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar alarm notification service"/>
 
 </oaf_server>
 
@@ -17,8 +17,8 @@
             type="factory"
             location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
 
-	<oaf_attribute name="description" type="string"
-                       _value="Alarm notification service"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar alarm notification service"/>
 </oaf_server>
 
 </oaf_info>
Index: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in,v
retrieving revision 1.3
diff -u -r1.3 GNOME_Evolution_Calendar_Importer.server.in.in
--- calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in	19 Mar 2003 20:29:05 -0000	1.3
+++ calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in	4 Apr 2003 19:04:48 -0000
@@ -7,8 +7,8 @@
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to import iCalendar files into Evolution"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution iCalendar importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
@@ -19,9 +19,9 @@
 		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="evolution:menu_name" type="string"
-                       value="iCalendar files (.ics)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports iCalendar files into Evolution"/>
+                       _value="iCalendar files (.ics)"/>
+        <oaf_attribute name="name" type="string"
+                       _value="Evolution iCalendar importer"/>
 
 </oaf_server>
 
@@ -33,9 +33,9 @@
 		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="evolution:menu_name" type="string"
-                       value="vCalendar files (.vcf)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports vCalendar files into Evolution"/>
+                       _value="vCalendar files (.vcf)"/>
+        <oaf_attribute name="name" type="string"
+                       _value="Evolution vCalendar importer"/>
 
 </oaf_server>
 
@@ -46,6 +46,9 @@
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
+
+        <oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar intelligent importer"/>
 
 </oaf_server>
 </oaf_info>
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2675
diff -u -r1.2675 ChangeLog
--- mail/ChangeLog	2 Apr 2003 16:35:21 -0000	1.2675
+++ mail/ChangeLog	4 Apr 2003 19:04:56 -0000
@@ -1,3 +1,25 @@
+2003-04-04  Dan Winship  <danw ximian com>
+
+	* GNOME_Evolution_Mail.server.in.in: Clean up server names
+
+	* importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:
+	Likewise, and fix evolution-mail location
+
+	* importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in:
+	Likewise
+
+	* importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in:
+	Likewise
+
+	* importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in:
+	Likewise
+
+	* importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in:
+	Likewise
+
+	* importers/Makefile.am (%.server.in): Fix this for evolution-mail
+	being a shlib.
+
 2003-04-02  Rodrigo Moya <rodrigo ximian com>
 
 	* importers/evolution-mbox-importer.c (load_file_fn):
Index: mail/GNOME_Evolution_Mail.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/GNOME_Evolution_Mail.server.in.in,v
retrieving revision 1.4
diff -u -r1.4 GNOME_Evolution_Mail.server.in.in
--- mail/GNOME_Evolution_Mail.server.in.in	26 Feb 2003 17:57:36 -0000	1.4
+++ mail/GNOME_Evolution_Mail.server.in.in	4 Apr 2003 19:04:56 -0000
@@ -11,8 +11,8 @@
       <item value="IDL:GNOME/ObjectFactory:1.0"/>
     </oaf_attribute>
 
-    <oaf_attribute name="description" type="string"
-		   _value="Factory for the controls exported by the Evolution Mailer"/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail"/>
   </oaf_server>
 
   <!-- (control) -->
@@ -25,8 +25,8 @@
       <item value="IDL:GNOME/Control:1.0"/>
     </oaf_attribute>
 
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail folder display component."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail folder viewer"/>
   </oaf_server>
 
   <!-- Shell Component -->
@@ -39,8 +39,8 @@
       <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
     </oaf_attribute>
 
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution component for handling mail."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail component"/>
 
     <oaf_attribute name="evolution:shell_component_icon" type="string"
 		   value="evolution-inbox.png"/>
@@ -48,20 +48,6 @@
 		   value="1"/>
   </oaf_server>
 
-  <!-- Summary component, for showing info in the summary -->
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail executive summary component."/>
-  </oaf_server>
-
   <!-- Message composer -->
 
   <!-- (composer) -->
@@ -74,8 +60,8 @@
       <item value="IDL:Bonobo/ItemContainer:1.0"/>
     </oaf_attribute>
 
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail composer."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail composer"/>
   </oaf_server>
 
   <!-- MailConfig interface -->
@@ -87,8 +73,8 @@
       <item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
     </oaf_attribute>
 
-    <oaf_attribute name="description" type="string"
-                   _value="Mail configuration interface"/>
+    <oaf_attribute name="name" type="string"
+                   _value="Evolution Mail configuration interface"/>
   </oaf_server>
 
   <!-- FolderInfo interface -->
@@ -144,8 +130,8 @@
 
     <oaf_attribute name="evolution:config_item:priority" type="string" value="-10"/>
     
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Mail Accounts."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail accounts configuration control"/>
 
   </oaf_server>
 
@@ -169,8 +155,8 @@
     
     <oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/>
     
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Mailer."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail preferences control"/>
 
   </oaf_server>
 
@@ -194,8 +180,8 @@
     
     <oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/>
     
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Display Fonts."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail font configuration control"/>
 
   </oaf_server>
 
@@ -219,8 +205,8 @@
     
     <oaf_attribute name="evolution:config_item:priority" type="string" value="-8"/>
     
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Message Composer."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Mail composer configuration control"/>
 
   </oaf_server>
 
Index: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in,v
retrieving revision 1.1
diff -u -r1.1 GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
--- mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in	18 Nov 2002 11:36:50 -0000	1.1
+++ mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in	4 Apr 2003 19:04:56 -0000
@@ -1,12 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Elm importer">
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer"
@@ -17,5 +20,7 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Elm importer">
 </oaf_server>
 </oaf_info>
Index: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Mail_Mbox_Importer.server.in.in
--- mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in	19 Mar 2003 20:29:24 -0000	1.2
+++ mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in	4 Apr 2003 19:04:56 -0000
@@ -1,15 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import mbox into Evolution"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution mbox importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="MBox (mbox)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports mbox files into Evolution"/>
+		       _value="MBox (mbox)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution mbox importer"/>
 </oaf_server>
 
 </oaf_info>
Index: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in,v
retrieving revision 1.1
diff -u -r1.1 GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
--- mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in	18 Nov 2002 11:36:50 -0000	1.1
+++ mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in	4 Apr 2003 19:04:56 -0000
@@ -1,12 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Netscape Mail importer">
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer"
@@ -17,5 +20,7 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Netscape Mail importer">
 </oaf_server>
 </oaf_info>
Index: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in,v
retrieving revision 1.2
diff -u -r1.2 GNOME_Evolution_Mail_Outlook_Importer.server.in.in
--- mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in	19 Mar 2003 20:29:24 -0000	1.2
+++ mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in	4 Apr 2003 19:04:56 -0000
@@ -1,15 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import Outlook Express 4 mails into Evolution"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Outlook Express 4 importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="Outlook Express 4 (.mbx)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports Outlook Express 4 files into Evolution"/>
+		       _value="Outlook Express 4 (.mbx)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Outlook Express 4 importer"/>
 </oaf_server>
 
 </oaf_info>
Index: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in,v
retrieving revision 1.1
diff -u -r1.1 GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
--- mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in	18 Nov 2002 11:36:50 -0000	1.1
+++ mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in	4 Apr 2003 19:04:56 -0000
@@ -1,12 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Pine importer">
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer"
@@ -17,5 +20,7 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Pine importer">
 </oaf_server>
 </oaf_info>
Index: mail/importers/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- mail/importers/Makefile.am	21 Feb 2003 21:24:30 -0000	1.21
+++ mail/importers/Makefile.am	4 Apr 2003 19:04:56 -0000
@@ -91,7 +91,7 @@
 	GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)
 %.server.in: %.server.in.in
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)
Index: my-evolution/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/ChangeLog,v
retrieving revision 1.272
diff -u -r1.272 ChangeLog
--- my-evolution/ChangeLog	1 Apr 2003 06:00:07 -0000	1.272
+++ my-evolution/ChangeLog	4 Apr 2003 19:04:57 -0000
@@ -1,3 +1,7 @@
+2003-04-04  Dan Winship  <danw ximian com>
+
+	* GNOME_Evolution_Summary.server.in.in: clean up server names
+
 2003-03-31  Larry Ewing  <lewing ximian com>
 
 	* e-summary-factory.c: make the verbs static so they don't enter
Index: my-evolution/GNOME_Evolution_Summary.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/GNOME_Evolution_Summary.server.in.in,v
retrieving revision 1.4
diff -u -r1.4 GNOME_Evolution_Summary.server.in.in
--- my-evolution/GNOME_Evolution_Summary.server.in.in	4 Dec 2002 19:52:45 -0000	1.4
+++ my-evolution/GNOME_Evolution_Summary.server.in.in	4 Apr 2003 19:04:57 -0000
@@ -7,6 +7,10 @@
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:Bonobo/GenericFactory:1.0"/>
     </oaf_attribute>
+
+    <oaf_attribute name="name" type="string"
+                   _value="Evolution Summary">
+
   </oaf_server>
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
@@ -17,8 +21,8 @@
       <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
     </oaf_attribute>
 
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution Summary component."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Summary component"/>
 
     <oaf_attribute name="evolution:shell_component_icon" type="string"
 		   value="evolution-today.png"/>
@@ -50,8 +54,8 @@
 
     <oaf_attribute name="evolution:config_item:priority" type="string" value="-5"/>
     
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Summary."/>
+    <oaf_attribute name="name" type="string"
+		   _value="Evolution Summary configuration control"/>
 
   </oaf_server>
 
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/po/ChangeLog,v
retrieving revision 1.1024
diff -u -r1.1024 ChangeLog
--- po/ChangeLog	3 Apr 2003 12:54:43 -0000	1.1024
+++ po/ChangeLog	4 Apr 2003 19:04:58 -0000
@@ -1,3 +1,7 @@
+2003-04-04  Dan Winship  <danw ximian com>
+
+	* POTFILES.in: add tools/killev.c
+
 2003-04-03  Pablo Gonzalo del Campo <pablodc bigfoot com>
 
         * es.po: Updated Spanish translation by
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/evolution/po/POTFILES.in,v
retrieving revision 1.171
diff -u -r1.171 POTFILES.in
--- po/POTFILES.in	23 Mar 2003 03:36:06 -0000	1.171
+++ po/POTFILES.in	4 Apr 2003 19:04:58 -0000
@@ -359,6 +359,7 @@
 tools/evolution-addressbook-export.c
 tools/evolution-addressbook-import.c
 tools/evolution-launch-composer.c
+tools/killev.c
 ui/evolution-addressbook.xml
 ui/evolution-calendar.xml
 ui/evolution-comp-editor.xml
Index: wombat/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/wombat/ChangeLog,v
retrieving revision 1.82
diff -u -r1.82 ChangeLog
--- wombat/ChangeLog	28 Mar 2003 21:41:44 -0000	1.82
+++ wombat/ChangeLog	4 Apr 2003 19:05:06 -0000
@@ -1,3 +1,9 @@
+2003-04-04  Dan Winship  <danw ximian com>
+
+	* GNOME_Evolution_WombatLDAP.server.in.in: clean up server names
+
+	* GNOME_Evolution_WombatNOLDAP.server.in.in: Likewise
+
 2003-03-28  Ettore Perazzoli  <ettore ximian com>
 
 	* GNOME_Evolution_WombatLDAP.server.in.in: Add InterfaceCheck
Index: wombat/GNOME_Evolution_WombatLDAP.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/wombat/GNOME_Evolution_WombatLDAP.server.in.in,v
retrieving revision 1.4
diff -u -r1.4 GNOME_Evolution_WombatLDAP.server.in.in
--- wombat/GNOME_Evolution_WombatLDAP.server.in.in	28 Mar 2003 21:41:44 -0000	1.4
+++ wombat/GNOME_Evolution_WombatLDAP.server.in.in	4 Apr 2003 19:05:06 -0000
@@ -9,8 +9,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Addressbook Server"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook local/LDAP backend"/>
 
         <oaf_attribute name="addressbook:supported_protocols" type="stringv">
 		<item value="ldap"/>
@@ -27,8 +27,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Calendar Server; calendar factory"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar local file backend"/>
 
 </oaf_server>
 
@@ -40,8 +40,6 @@
 		<item value="IDL:GNOME/Evolution/WombatInterfaceCheck:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" _value="Wombat InterfaceCheck interface"/>
 
 </oaf_server>
 
Index: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in,v
retrieving revision 1.5
diff -u -r1.5 GNOME_Evolution_WombatNOLDAP.server.in.in
--- wombat/GNOME_Evolution_WombatNOLDAP.server.in.in	28 Mar 2003 21:41:44 -0000	1.5
+++ wombat/GNOME_Evolution_WombatNOLDAP.server.in.in	4 Apr 2003 19:05:06 -0000
@@ -9,8 +9,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Addressbook Server"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook local file backend"/>
 
         <oaf_attribute name="addressbook:supported_protocols" type="stringv">
 		<item value="file"/>
@@ -26,8 +26,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Calendar Server; calendar factory"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar local file backend"/>
 
 </oaf_server>
 
@@ -39,8 +39,6 @@
 		<item value="IDL:GNOME/Evolution/WombatInterfaceCheck:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" _value="Wombat InterfaceCheck interface"/>
 
 </oaf_server>