Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*" to sync up

2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>

	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
	to sync up with yesterday's IDL re-scoping.

svn path=/trunk/; revision=6541

36 files changed, 88 insertions, 46 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index cbd0586c60..c20e425c6f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* gui/component/addressbook.oafinfo:
+	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
+	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
+	to sync up with yesterday's IDL re-scoping.
+
 2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
 
 	* backend/pas/pas-backend-ldap.c: Fixed a warning.
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
index a41848b25b..dc16ad8a2c 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
@@ -79,7 +79,7 @@
             location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent: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 a41848b25b..dc16ad8a2c 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
@@ -79,7 +79,7 @@
             location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent: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 a41848b25b..dc16ad8a2c 100644
--- a/addressbook/gui/component/addressbook.oafinfo
+++ b/addressbook/gui/component/addressbook.oafinfo
@@ -79,7 +79,7 @@
             location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent: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 e66c3aa38a..24e78d8efe 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
@@ -18,7 +18,7 @@
             location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Addressbook/SelectNames"/>
+		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
 	</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 e66c3aa38a..24e78d8efe 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
@@ -18,7 +18,7 @@
             location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Addressbook/SelectNames"/>
+		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
 	</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 e66c3aa38a..24e78d8efe 100644
--- a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
+++ b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
@@ -18,7 +18,7 @@
             location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Addressbook/SelectNames"/>
+		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 182c1c9a90..f2d797590a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* gui/evolution-calendar.oafinfo:
+	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
+	to sync up with yesterday's IDL re-scoping.
+
 2000-11-10  Michael Meeks  <michael@helixcode.com>
 
 	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
index 74fb43af70..cb761f7ffd 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
@@ -52,7 +52,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -79,7 +79,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent: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 74fb43af70..cb761f7ffd 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oafinfo
+++ b/calendar/gui/GNOME_Evolution_Calendar.oafinfo
@@ -52,7 +52,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -79,7 +79,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent: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 74fb43af70..cb761f7ffd 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
@@ -52,7 +52,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -79,7 +79,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent: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 74fb43af70..cb761f7ffd 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
+++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
@@ -52,7 +52,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -79,7 +79,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent: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 74fb43af70..cb761f7ffd 100644
--- a/calendar/gui/evolution-calendar.oafinfo
+++ b/calendar/gui/evolution-calendar.oafinfo
@@ -52,7 +52,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -79,7 +79,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 14ea0f33f5..6b3aa16e34 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* component/e-summary-factory.c: (control_activate_cb),
+	(embed_service):
+	* evolution-executive-summary.oafinfo:
+	* test-service/test-service.oafinfo:
+	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
+	to sync up with yesterday's IDL re-scoping.
+
 2000-11-10  Matt Bissiri  <bissiri@eecs.umich.edu>
 
 	* component/Makefile.am: Regenerate the idl-generated files
diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
index fe39e4e631..7543a41f08 100644
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ b/executive-summary/GNOME_Evolution_Summary.oaf.in
@@ -16,7 +16,7 @@
 	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent: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 fe39e4e631..7543a41f08 100644
--- a/executive-summary/GNOME_Evolution_Summary.oafinfo
+++ b/executive-summary/GNOME_Evolution_Summary.oafinfo
@@ -16,7 +16,7 @@
 	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 5ff8a54dc9..cf4f010fdc 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -135,7 +135,7 @@ control_activate_cb (BonoboControl *control,
 
 		CORBA_exception_init (&ev);
 		shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-								      "IDL:Evolution/ShellView:1.0",
+								      "IDL:GNOME/Evolution/ShellView:1.0",
 								      &ev);
 		CORBA_exception_free (&ev);
 
@@ -222,7 +222,7 @@ void
 embed_service (GtkWidget *widget,
 	       ESummary *esummary)
 {
-	char *required_interfaces[2] = {"IDL:Evolution:SummaryComponent:1.0",
+	char *required_interfaces[2] = {"IDL:GNOME/Evolution:SummaryComponent:1.0",
 					NULL};
 	char *obj_id;
 	
diff --git a/executive-summary/evolution-executive-summary.oafinfo b/executive-summary/evolution-executive-summary.oafinfo
index fe39e4e631..7543a41f08 100644
--- a/executive-summary/evolution-executive-summary.oafinfo
+++ b/executive-summary/evolution-executive-summary.oafinfo
@@ -16,7 +16,7 @@
 	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
index 2c2329255d..dd169b8853 100644
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
+++ b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
@@ -17,7 +17,7 @@
 		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
index 2c2329255d..dd169b8853 100644
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
+++ b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
@@ -17,7 +17,7 @@
 		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/executive-summary/test-service/test-service.oafinfo b/executive-summary/test-service/test-service.oafinfo
index 2c2329255d..dd169b8853 100644
--- a/executive-summary/test-service/test-service.oafinfo
+++ b/executive-summary/test-service/test-service.oafinfo
@@ -17,7 +17,7 @@
 		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f8472b82ba..77b97001eb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* evolution-mail.oafinfo:
+	* mail-threads.c: (retrieve_shell_view_interface_from_control):
+	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
+	to sync up with yesterday's IDL re-scoping.
+
 2000-11-10  Michael Meeks  <michael@helixcode.com>
 
 	* Makefile.am ($(EVOLUTION_MAIL_CORBA_GENERATED)): sort include order.
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
index 81edb07292..010c687830 100644
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ b/mail/GNOME_Evolution_Mail.oaf.in
@@ -43,7 +43,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -70,7 +70,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -94,7 +94,7 @@
 	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:Composer:1.0"/>
+		<item value="IDL:GNOME/Evolution:Composer: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 81edb07292..010c687830 100644
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ b/mail/GNOME_Evolution_Mail.oafinfo
@@ -43,7 +43,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -70,7 +70,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -94,7 +94,7 @@
 	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:Composer:1.0"/>
+		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/mail/evolution-mail.oafinfo b/mail/evolution-mail.oafinfo
index 81edb07292..010c687830 100644
--- a/mail/evolution-mail.oafinfo
+++ b/mail/evolution-mail.oafinfo
@@ -43,7 +43,7 @@
             location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -70,7 +70,7 @@
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
@@ -94,7 +94,7 @@
 	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:Composer:1.0"/>
+		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index 588576e872..8e9365eac7 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -1039,7 +1039,7 @@ retrieve_shell_view_interface_from_control (BonoboControl *control)
 
 	CORBA_exception_init (&ev);
 	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-							       "IDL:Evolution/ShellView:1.0",
+							       "IDL:GNOME/Evolution/ShellView:1.0",
 							       &ev);
 	CORBA_exception_free (&ev);
 
diff --git a/notes/GNOME_Evolution_Notes.oaf.in b/notes/GNOME_Evolution_Notes.oaf.in
index 704b4028d8..17be3617a3 100644
--- a/notes/GNOME_Evolution_Notes.oaf.in
+++ b/notes/GNOME_Evolution_Notes.oaf.in
@@ -43,7 +43,7 @@
 	type="factory"
 	location="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent: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 704b4028d8..17be3617a3 100644
--- a/notes/GNOME_Evolution_Notes.oafinfo
+++ b/notes/GNOME_Evolution_Notes.oafinfo
@@ -43,7 +43,7 @@
 	type="factory"
 	location="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/notes/evolution-notes.oafinfo b/notes/evolution-notes.oafinfo
index 704b4028d8..17be3617a3 100644
--- a/notes/evolution-notes.oafinfo
+++ b/notes/evolution-notes.oafinfo
@@ -43,7 +43,7 @@
 	type="factory"
 	location="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2fc012e223..312b1356f2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* e-shell.c: (setup_components), (save_settings_for_component):
+	* evolution-storage.c: (evolution_storage_register_on_shell):
+	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
+	to sync up with yesterday's IDL re-scoping.
+
 2000-11-06  Michael Meeks  <michael@helixcode.com>
 
 	* e-shell-view.c (unrealize): remove.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index f9b42ba8e5..faad9979f1 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -387,7 +387,7 @@ setup_components (EShell *shell,
 	priv = shell->priv;
 	priv->component_registry = e_component_registry_new (shell);
 
-	info_list = oaf_query ("repo_ids.has ('IDL:Evolution/ShellComponent:1.0')", NULL, &ev);
+	info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/ShellComponent:1.0')", NULL, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION)
 		g_error ("Eeek!  Cannot perform OAF query for Evolution components.");
@@ -913,7 +913,7 @@ save_settings_for_component (EShell *shell,
 
 	CORBA_exception_init (&ev);
 
-	session_interface = Bonobo_Unknown_queryInterface (unknown_interface, "IDL:Evolution/Session:1.0", &ev);
+	session_interface = Bonobo_Unknown_queryInterface (unknown_interface, "IDL:GNOME/Evolution/Session:1.0", &ev);
 	if (ev._major != CORBA_NO_EXCEPTION || CORBA_Object_is_nil (session_interface, &ev)) {
 		CORBA_exception_free (&ev);
 		return TRUE;
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 6f67a71471..49b7b36805 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -460,7 +460,7 @@ evolution_storage_register_on_shell (EvolutionStorage *evolution_storage,
 	CORBA_exception_init (&ev);
 
 	corba_storage_registry = Bonobo_Unknown_queryInterface (corba_shell,
-								 "IDL:Evolution/StorageRegistry:1.0",
+								 "IDL:GNOME/Evolution/StorageRegistry:1.0",
 								 &ev);
 	if (corba_storage_registry == CORBA_OBJECT_NIL || ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 124fb81aea..319c0c3544 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* wombat.oafinfo:
+	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
+	to sync up with yesterday's IDL re-scoping.
+
 2000-10-23  Dan Winship  <danw@helixcode.com>
 
 	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in
index 1109cc0df6..466443d1ab 100644
--- a/wombat/GNOME_Evolution_Wombat.oaf.in
+++ b/wombat/GNOME_Evolution_Wombat.oaf.in
@@ -5,7 +5,7 @@
             location="wombat">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/BookFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
@@ -18,7 +18,7 @@
             location="wombat">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
diff --git a/wombat/GNOME_Evolution_Wombat.oafinfo b/wombat/GNOME_Evolution_Wombat.oafinfo
index 1109cc0df6..466443d1ab 100644
--- a/wombat/GNOME_Evolution_Wombat.oafinfo
+++ b/wombat/GNOME_Evolution_Wombat.oafinfo
@@ -5,7 +5,7 @@
             location="wombat">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/BookFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
@@ -18,7 +18,7 @@
             location="wombat">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
diff --git a/wombat/wombat.oafinfo b/wombat/wombat.oafinfo
index 1109cc0df6..466443d1ab 100644
--- a/wombat/wombat.oafinfo
+++ b/wombat/wombat.oafinfo
@@ -5,7 +5,7 @@
             location="wombat">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/BookFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
@@ -18,7 +18,7 @@
             location="wombat">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>