Removed .oafinfo files -- they are obsolete. Moved pixmaps from

2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>

Removed .oafinfo files -- they are obsolete.
Moved pixmaps from calendar/gui/ to art/
Moved evolution.png to art/
Moved evolution.desktop.in to data/
Generate doc/devel/executive-summary/Makefile

svn path=/trunk/; revision=8727

34 files changed, 73 insertions, 612 deletions

diff --git a/.cvsignore b/.cvsignore
index 6df7b90c42..5d4ce997d6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -22,7 +22,5 @@ stamp-h.in
 stamp.h
 xlibtool
 xltmain.sh
-evolution.desktop
 evolution.spec
 xml-i18n-*
-
diff --git a/ChangeLog b/ChangeLog
index b4cb28e408..7fced968c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
-2001-03-14  Gediminas Paulauskas <menesis@delfi.lt>
+2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* configure.in: create doc/devel/executive-summary/Makefile
+	* evolution.png: moved to art/.
+	* evolution.desktop: moved to data/.
+	* Makefile.am: reflect those moves.
+	* art/*.xpm: moved 8 files from calendar/gui here.
+	* art/Makefile.am: added moved files.
+	distribute *.xpm, install *.png and *view.xpm.
 
 2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
 
diff --git a/Makefile.am b/Makefile.am
index 065e218ad5..cc6c804035 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,6 @@
 changelogs =			\
 	ChangeLog
 
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-applicationdir = $(datadir)/gnome/apps/Applications
-application_in_files = evolution.desktop.in
-application_DATA = $(application_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
 EXTRA_DIST =			\
 	AUTHORS			\
 	$(changelogs)		\
@@ -17,8 +9,6 @@ EXTRA_DIST =			\
 	HACKING			\
 	MAINTAINERS		\
 	NEWS			\
-	$(appicon_DATA)		\
-	$(application_in_files)	\
 	xml-i18n-merge.in	\
 	xml-i18n-update.in	\
 	xml-i18n-extract.in
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
deleted file mode 100644
index 46f2a1fa4e..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory"
-	    type="exe"
-	    location="evolution-gnomecard-importer">
-
-	<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 GnomeCard files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="GnomeCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       value="Imports GnomeCard files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
deleted file mode 100644
index 03c2e66d19..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
+++ /dev/null
@@ -1,119 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</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."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<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_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<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="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory"
-	    type="exe"
-	    location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Addressbook's address displayer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="A Bonobo control for displaying an address."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
deleted file mode 100644
index e3719967b0..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<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_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/art/Makefile.am b/art/Makefile.am
index c0ef0a2ab3..fddb9fbbc6 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,5 +1,4 @@
 imagesdir = $(datadir)/images/evolution
-
 images_DATA = \
 	16_configure_addressbook.xpm	\
 	16_configure_addressbook.xpm	\
@@ -61,8 +60,8 @@ buttons_DATA = 				\
 	monthview.xpm  			\
 	move-message.png		\
 	new_appointment.png		\
-	reply-to-all.png		\
 	reply.png			\
+	reply-to-all.png		\
 	weekview.xpm  			\
 	workweekview.xpm		\
 	yearview.xpm	
@@ -76,31 +75,38 @@ conduits_DATA =				\
 	48_evo-address-conduit.png  	\
 	48_evo-todo-conduit.png
 
+appicondir = $(datadir)/pixmaps
+appicon_DATA = evolution.png
+
 EXTRA_DIST = \
-	add-service.png	\
-	attachment.xpm \
-	compose-message.png \
-	copy-message.png \
-	empty.xpm \
-	fetch-mail.png \
-	forward.png \
-	mail-new.xpm \
-	mail-read.xpm \
-	mail-replied.xpm \
-	mark.xpm \
-	meeting.xpm \
-	move-message.png \
-	priority-high.xpm \
-	priority-low.xpm \
-	reply.png \
-	reply-to-all.png \
-	tree-expanded.xpm \
-	tree-unexpanded.xpm \
-	score-lowest.xpm \
-	score-lower.xpm \
-	score-low.xpm \
-	score-normal.xpm \
-	score-high.xpm \
-	score-higher.xpm \
-	score-highest.xpm \
-	$(images_DATA)
+	attachment.xpm			\
+	bell.xpm			\
+	check-filled.xpm		\
+	empty.xpm			\
+	jump.xpm			\
+	mail-new.xpm			\
+	mail-read.xpm			\
+	mail-replied.xpm		\
+	mark.xpm			\
+	meeting.xpm			\
+	priority-high.xpm		\
+	priority-low.xpm		\
+	recur.xpm			\
+	score-higher.xpm		\
+	score-highest.xpm		\
+	score-high.xpm			\
+	score-lower.xpm			\
+	score-lowest.xpm		\
+	score-low.xpm			\
+	score-normal.xpm		\
+	task-assigned-to.xpm		\
+	task-assigned.xpm		\
+	task-recurring.xpm		\
+	task.xpm			\
+	tree-expanded.xpm		\
+	tree-unexpanded.xpm		\
+	$(images_DATA)			\
+	$(buttons_DATA)			\
+	$(conduits_DATA)		\
+	$(appicon_DATA)
+
diff --git a/calendar/gui/bell.xpm b/art/bell.xpm
index b1ab537a17..b1ab537a17 100644
--- a/calendar/gui/bell.xpm
+++ b/art/bell.xpm
diff --git a/calendar/gui/check-filled.xpm b/art/check-filled.xpm
index c0468fc25b..c0468fc25b 100644
--- a/calendar/gui/check-filled.xpm
+++ b/art/check-filled.xpm
diff --git a/evolution.png b/art/evolution.png
index 3b0f90b292..3b0f90b292 100644
--- a/evolution.png
+++ b/art/evolution.png
diff --git a/calendar/gui/jump.xpm b/art/jump.xpm
index d974142d9a..d974142d9a 100644
--- a/calendar/gui/jump.xpm
+++ b/art/jump.xpm
diff --git a/calendar/gui/recur.xpm b/art/recur.xpm
index bb34fa4568..bb34fa4568 100644
--- a/calendar/gui/recur.xpm
+++ b/art/recur.xpm
diff --git a/calendar/gui/task-assigned-to.xpm b/art/task-assigned-to.xpm
index d60eeafa2d..d60eeafa2d 100644
--- a/calendar/gui/task-assigned-to.xpm
+++ b/art/task-assigned-to.xpm
diff --git a/calendar/gui/task-assigned.xpm b/art/task-assigned.xpm
index 9b245c0c49..9b245c0c49 100644
--- a/calendar/gui/task-assigned.xpm
+++ b/art/task-assigned.xpm
diff --git a/calendar/gui/task-recurring.xpm b/art/task-recurring.xpm
index 634cd87a84..634cd87a84 100644
--- a/calendar/gui/task-recurring.xpm
+++ b/art/task-recurring.xpm
diff --git a/calendar/gui/task.xpm b/art/task.xpm
index 4a53c3e9ab..4a53c3e9ab 100644
--- a/calendar/gui/task.xpm
+++ b/art/task.xpm
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f114a406ce..5d6926a941 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* gui/*.xpm: moved to ../art.
+	* gui/Makefile.am: removed *.xpm and oaf_DATA from EXTRA_DIST.
+	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c:
+	#include "art/*.xpm".
+
 2001-03-09  JP Rosevear  <jpr@ximian.com>
 
 	* conduits/todo/Makefile.am: PISOCK_INCLUDEDIR has become
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 7c4a862b15..20e5b35b24 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -138,20 +138,7 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 
 EXTRA_DIST =	 			\
 	$(glade_DATA)			\
-	bell.xpm			\
-	check-filled.xpm		\
-	dayview.xpm			\
-	jump.xpm			\
-	monthview.xpm			\
-	recur.xpm			\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	task.xpm			\
-	weekview.xpm			\
-	workweekview.xpm		\
-	yearview.xpm			\
-	$(oaf_in_files) $(oaf_DATA)
+	$(oaf_in_files)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index f173ac3783..4806d05c21 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -44,12 +44,12 @@
 #include "dialogs/task-editor.h"
 
 /* Pixmaps. */
-#include "task.xpm"
-#include "task-recurring.xpm"
-#include "task-assigned.xpm"
-#include "task-assigned-to.xpm"
+#include "art/task.xpm"
+#include "art/task-recurring.xpm"
+#include "art/task-assigned.xpm"
+#include "art/task-assigned-to.xpm"
 
-#include "check-filled.xpm"
+#include "art/check-filled.xpm"
 
 
 static void e_calendar_table_class_init		(ECalendarTableClass *class);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 537ef44ebc..3c14a24359 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -46,8 +46,8 @@
 #include "e-meeting-edit.h"
 
 /* Images */
-#include "bell.xpm"
-#include "recur.xpm"
+#include "art/bell.xpm"
+#include "art/recur.xpm"
 
 /* The minimum amount of space wanted on each side of the date string. */
 #define E_DAY_VIEW_DATE_X_PAD	4
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 91a5219c87..7af5994cde 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -47,10 +47,10 @@
 #include "e-meeting-edit.h"
 
 /* Images */
-#include "bell.xpm"
-#include "recur.xpm"
+#include "art/bell.xpm"
+#include "art/recur.xpm"
 
-#include "jump.xpm"
+#include "art/jump.xpm"
 
 #define E_WEEK_VIEW_SMALL_FONT	\
 	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"
diff --git a/data/.cvsignore b/data/.cvsignore
index 13fe803164..5f6365598d 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 evolution.keys
+evolution.desktop
diff --git a/data/Makefile.am b/data/Makefile.am
index e142dce664..a782cccc46 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,14 @@
+desktopdir = $(datadir)/gnome/apps/Applications
+desktop_in_files = evolution.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@XML_I18N_MERGE_DESKTOP_RULE@
+
 keysdir = $(datadir)/mime-info
 keys_in_files = evolution.keys.in
 keys_DATA = $(keys_in_files:.keys.in=.keys) 
+@XML_I18N_MERGE_KEYS_RULE@
 
 mimedir = $(datadir)/mime-info
 mime_DATA = evolution.mime
 
-@XML_I18N_MERGE_KEYS_RULE@
-
-EXTRA_DIST = $(keys_in_files) $(mime_DATA)
+EXTRA_DIST = $(desktop_in_files) $(keys_in_files) $(mime_DATA)
diff --git a/evolution.desktop.in b/data/evolution.desktop.in
index de3c05adb1..de3c05adb1 100644
--- a/evolution.desktop.in
+++ b/data/evolution.desktop.in
diff --git a/doc/devel/executive-summary/.cvsignore b/doc/devel/executive-summary/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/doc/devel/executive-summary/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo
deleted file mode 100644
index c5119bccd1..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo
deleted file mode 100644
index 4cb096b3ae..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"
-		type="exe"
-		location="rdf-summary">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the RDF summary."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory">
-
-	<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="RDF Summary"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
deleted file mode 100644
index 098da5e393..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
+++ /dev/null
@@ -1,53 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory">
-
-	<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="Test service"/>
-</oaf_server>
-
-<!-- This does not work
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"
-                type="exe"
-                location="test-bonobo-service">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME:GenericFactory:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        value="Factory for the test bonobo component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-                type="factory"
-                location="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:Evolution:SummaryComponent:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        value="Test bonobo service"/>
-</oaf_server>
-
--->
-</oaf_info>
diff --git a/help/devel/executive-summary/.cvsignore b/help/devel/executive-summary/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/help/devel/executive-summary/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo
deleted file mode 100644
index b976e15a1c..0000000000
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ /dev/null
@@ -1,157 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<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="evolution:shell-component-icon" type="string"
-		       value="evolution-inbox.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Mail Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
-
-	<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>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Evolution composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution mail composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<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_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</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"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<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_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</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"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/notes/GNOME_Evolution_Notes.oafinfo b/notes/GNOME_Evolution_Notes.oafinfo
deleted file mode 100644
index 8bf763e546..0000000000
--- a/notes/GNOME_Evolution_Notes.oafinfo
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_controlFactory"
-            type="exe"
-            location="evolution-notes">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Notes control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_control"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_controlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<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_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
-	type="exe"
-	location="evolution-notes">
-	
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution notes component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8b57dd7a25..ee8ed8dd46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -118,6 +118,7 @@ composer/e-msg-composer-attachment.glade
 composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
 composer/evolution-composer.c
+data/evolution.desktop.in
 data/evolution.keys.in
 default_user/searches.xml
 e-util/e-time-utils.c
@@ -215,4 +216,3 @@ widgets/misc/e-messagebox.c
 widgets/misc/e-search-bar.c
 wombat/GNOME_Evolution_Wombat.oaf.in
 wombat/wombat.c
-evolution.desktop.in
diff --git a/shell/GNOME_Evolution_Shell.oafinfo b/shell/GNOME_Evolution_Shell.oafinfo
deleted file mode 100644
index 38a3b7b778..0000000000
--- a/shell/GNOME_Evolution_Shell.oafinfo
+++ /dev/null
@@ -1,15 +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_info>
diff --git a/wombat/GNOME_Evolution_Wombat.oafinfo b/wombat/GNOME_Evolution_Wombat.oafinfo
deleted file mode 100644
index 8f74e35512..0000000000
--- a/wombat/GNOME_Evolution_Wombat.oafinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Personal Addressbook Server"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Personal Calendar Server; calendar factory"/>
-
-</oaf_server>
-
-</oaf_info>