#!/usr/bin/perl -pi.bak

    s/GNOME\/GenericFactory/GNOME\/ObjectFactory/g;
    s/Bonobo\/EmbeddableFactory/GNOME\/ObjectFactory/g;
    s/Bonobo\/GenericFactory/GNOME\/ObjectFactory/g;

svn path=/trunk/; revision=6580

24 files changed, 41 insertions, 41 deletions

diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
index dc16ad8a2c..155fa65e92 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -66,7 +66,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
index dc16ad8a2c..155fa65e92 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -66,7 +66,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/addressbook/gui/component/addressbook.oafinfo b/addressbook/gui/component/addressbook.oafinfo
index dc16ad8a2c..155fa65e92 100644
--- a/addressbook/gui/component/addressbook.oafinfo
+++ b/addressbook/gui/component/addressbook.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -66,7 +66,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
index 24e78d8efe..afbeb2a3fd 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
index 24e78d8efe..afbeb2a3fd 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
index 24e78d8efe..afbeb2a3fd 100644
--- a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
+++ b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-addressbook">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
index cb761f7ffd..b7eb514f7e 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo
index cb761f7ffd..b7eb514f7e 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oafinfo
+++ b/calendar/gui/GNOME_Evolution_Calendar.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
index fb0f138caf..f67c8eb416 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
index fb0f138caf..f67c8eb416 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
+++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
index cb761f7ffd..b7eb514f7e 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
index cb761f7ffd..b7eb514f7e 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
+++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/calendar-control.oafinfo b/calendar/gui/calendar-control.oafinfo
index fb0f138caf..f67c8eb416 100644
--- a/calendar/gui/calendar-control.oafinfo
+++ b/calendar/gui/calendar-control.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/evolution-calendar.oafinfo b/calendar/gui/evolution-calendar.oafinfo
index cb761f7ffd..b7eb514f7e 100644
--- a/calendar/gui/evolution-calendar.oafinfo
+++ b/calendar/gui/evolution-calendar.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -39,7 +39,7 @@
             location="evolution-calendar">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/gui/gnomecal.oafinfo b/calendar/gui/gnomecal.oafinfo
index c4b91b9dd8..6af67e9fe0 100644
--- a/calendar/gui/gnomecal.oafinfo
+++ b/calendar/gui/gnomecal.oafinfo
@@ -17,7 +17,7 @@
             location="gnomecal">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
index 7543a41f08..f9d198ff35 100644
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ b/executive-summary/GNOME_Evolution_Summary.oaf.in
@@ -4,7 +4,7 @@
 	type="exe"
 	location="evolution-executive-summary">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string" 
diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo
index 7543a41f08..f9d198ff35 100644
--- a/executive-summary/GNOME_Evolution_Summary.oafinfo
+++ b/executive-summary/GNOME_Evolution_Summary.oafinfo
@@ -4,7 +4,7 @@
 	type="exe"
 	location="evolution-executive-summary">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string" 
diff --git a/executive-summary/evolution-executive-summary.oafinfo b/executive-summary/evolution-executive-summary.oafinfo
index 7543a41f08..f9d198ff35 100644
--- a/executive-summary/evolution-executive-summary.oafinfo
+++ b/executive-summary/evolution-executive-summary.oafinfo
@@ -4,7 +4,7 @@
 	type="exe"
 	location="evolution-executive-summary">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string" 
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
index 010c687830..b187ffc121 100644
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ b/mail/GNOME_Evolution_Mail.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-mail">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -30,7 +30,7 @@
             location="evolution-mail">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo
index 010c687830..b187ffc121 100644
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ b/mail/GNOME_Evolution_Mail.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-mail">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -30,7 +30,7 @@
             location="evolution-mail">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/mail/evolution-mail.oafinfo b/mail/evolution-mail.oafinfo
index 010c687830..b187ffc121 100644
--- a/mail/evolution-mail.oafinfo
+++ b/mail/evolution-mail.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-mail">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -30,7 +30,7 @@
             location="evolution-mail">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/notes/GNOME_Evolution_Notes.oaf.in b/notes/GNOME_Evolution_Notes.oaf.in
index 17be3617a3..cfe67d7337 100644
--- a/notes/GNOME_Evolution_Notes.oaf.in
+++ b/notes/GNOME_Evolution_Notes.oaf.in
@@ -5,7 +5,7 @@
             location="evolution-notes">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -31,7 +31,7 @@
 	location="evolution-notes">
 	
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/notes/GNOME_Evolution_Notes.oafinfo b/notes/GNOME_Evolution_Notes.oafinfo
index 17be3617a3..cfe67d7337 100644
--- a/notes/GNOME_Evolution_Notes.oafinfo
+++ b/notes/GNOME_Evolution_Notes.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-notes">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -31,7 +31,7 @@
 	location="evolution-notes">
 	
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/notes/evolution-notes.oafinfo b/notes/evolution-notes.oafinfo
index 17be3617a3..cfe67d7337 100644
--- a/notes/evolution-notes.oafinfo
+++ b/notes/evolution-notes.oafinfo
@@ -5,7 +5,7 @@
             location="evolution-notes">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -31,7 +31,7 @@
 	location="evolution-notes">
 	
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"