replace all the OAFIIDs with more sensibly named ones, that follow the

2002-04-18  Michael Meeks  <michael@ximian.com>

	* *.server.in, *.c: replace all the OAFIIDs with more
	sensibly named ones, that follow the namespacing
	guidelines in the libbonobo/docs/FAQ. Needs a new
	gnome-vfs to work well.

	* src/nautilus-window-toolbars.c
	(throbber_set_throbbing): impl.
	(throbber_created_callback): upd.
	(nautilus_window_allow_stop): upd.

	* libnautilus-private/nautilus-mime-actions.c
	(nautilus_do_component_query): remove hack around bonobo's
	sample text component, we no longer have one.

6 files changed, 15 insertions, 14 deletions

diff --git a/components/loser/content/Nautilus_View_content-loser.server.in b/components/loser/content/Nautilus_View_content-loser.server.in
index 4b0fa832a..7b4039a8a 100644
--- a/components/loser/content/Nautilus_View_content-loser.server.in
+++ b/components/loser/content/Nautilus_View_content-loser.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69" type="exe" location="nautilus-content-loser">
+<oaf_server iid="OAFIID:Nautilus_Content_Loser_Factory" type="exe" location="nautilus-content-loser">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -8,7 +8,7 @@
 	<oaf_attribute name="description" type="string" _value="Nautilus content loser component's factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d" type="factory" location="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69">
+	<oaf_server iid="OAFIID:Nautilus_Content_Loser" type="factory" location="OAFIID:Nautilus_Content_Loser_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/components/loser/content/Nautilus_View_content-loser.server.in.in b/components/loser/content/Nautilus_View_content-loser.server.in.in
index 4b0fa832a..7b4039a8a 100644
--- a/components/loser/content/Nautilus_View_content-loser.server.in.in
+++ b/components/loser/content/Nautilus_View_content-loser.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69" type="exe" location="nautilus-content-loser">
+<oaf_server iid="OAFIID:Nautilus_Content_Loser_Factory" type="exe" location="nautilus-content-loser">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -8,7 +8,7 @@
 	<oaf_attribute name="description" type="string" _value="Nautilus content loser component's factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d" type="factory" location="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69">
+	<oaf_server iid="OAFIID:Nautilus_Content_Loser" type="factory" location="OAFIID:Nautilus_Content_Loser_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/components/loser/content/main.c b/components/loser/content/main.c
index fca9b373d..29c9b5bc4 100644
--- a/components/loser/content/main.c
+++ b/components/loser/content/main.c
@@ -53,7 +53,7 @@ loser_make_object (BonoboGenericFactory *factory,
 
 	nautilus_content_loser_maybe_fail ("pre-make-object");
 
-	if (strcmp (iid, "OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d")) {
+	if (strcmp (iid, "OAFIID:Nautilus_Content_Loser")) {
 		return NULL;
 	}
 
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 	nautilus_content_loser_maybe_fail ("post-init");
 
         registration_id = eel_bonobo_make_registration_id
-		("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69");
+		("OAFIID:Nautilus_Content_Loser_Factory");
 	factory = bonobo_generic_factory_new (registration_id,
 					      loser_make_object,
 					      NULL);
diff --git a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in
index 18871a2ad..63814e5f3 100644
--- a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in
+++ b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa" type="exe" location="nautilus-sidebar-loser">
+<oaf_server iid="OAFIID:Nautilus_Sidebar_Loser_Factory" type="exe" location="nautilus-sidebar-loser">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -8,7 +8,7 @@
 	<oaf_attribute name="description" type="string" _value="Nautilus sidebar loser component's factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0" type="factory" location="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa">
+<oaf_server iid="OAFIID:Nautilus_Sidebar_Loser" type="factory" location="OAFIID:Nautilus_Sidebar_Loser_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in
index 18871a2ad..63814e5f3 100644
--- a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in
+++ b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa" type="exe" location="nautilus-sidebar-loser">
+<oaf_server iid="OAFIID:Nautilus_Sidebar_Loser_Factory" type="exe" location="nautilus-sidebar-loser">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -8,7 +8,7 @@
 	<oaf_attribute name="description" type="string" _value="Nautilus sidebar loser component's factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0" type="factory" location="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa">
+<oaf_server iid="OAFIID:Nautilus_Sidebar_Loser" type="factory" location="OAFIID:Nautilus_Sidebar_Loser_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/components/loser/sidebar/main.c b/components/loser/sidebar/main.c
index 11423146e..28093735d 100644
--- a/components/loser/sidebar/main.c
+++ b/components/loser/sidebar/main.c
@@ -32,6 +32,8 @@
 #include <eel/eel-gnome-extensions.h>
 #include <bonobo.h>
 
+#define FACTORY_IID "OAFIID:Nautilus_Sidebar_Loser_Factory"
+
 static int object_count = 0;
 
 static void
@@ -53,7 +55,7 @@ loser_make_object (BonoboGenericFactory *factory,
 
 	nautilus_sidebar_loser_maybe_fail ("pre-make-object");
 
-	if (strcmp (iid, "OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0")) {
+	if (strcmp (iid, "OAFIID:Nautilus_Sidebar_Loser")) {
 		return NULL;
 	}
 
@@ -84,9 +86,8 @@ int main(int argc, char *argv[])
 	
 	nautilus_sidebar_loser_maybe_fail ("post-init");
 
-        registration_id = eel_bonobo_make_registration_id (
-		"OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa");
-	factory = bonobo_generic_factory_new ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", 
+        registration_id = eel_bonobo_make_registration_id (FACTORY_IID);
+	factory = bonobo_generic_factory_new (FACTORY_IID,
 					      loser_make_object,
 					      NULL);
 	g_free (registration_id);