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.
author: Michael Meeks <michael@ximian.com> 2002-04-18 18:39:01 +0000
committer: Michael Meeks <michael@src.gnome.org> 2002-04-18 18:39:01 +0000
commit: e72152dd8e25e3d6309cbf2928e240fc99e1dd72 (patch)
tree: aa041c91718519fd813ab3edd95d6cc2315fd357
parent: 2af5520c56649f581d316824cdbaaafe80d3d2d1 (diff)
download: nautilus-e72152dd8e25e3d6309cbf2928e240fc99e1dd72.tar.gz
46 files changed, 160 insertions, 129 deletions
diff --git a/ChangeLog b/ChangeLog
index 895333d5d..57569c61b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+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.
+
 2002-04-17  Anders Carlsson  <andersca@gnu.org>
 
 	* src/file-manager/fm-properties-window.c:
diff --git a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in
index 650c886f8..7867a6eda 100644
--- a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in
+++ b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in
@@ -1,7 +1,7 @@
 <oaf_info>
 
 
-<oaf_server iid="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" type="exe" location="nautilus-adapter">
+<oaf_server iid="OAFIID:Nautilus_Adapter_Factory_Factory" type="exe" location="nautilus-adapter">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -9,7 +9,7 @@
 	<oaf_attribute name="description" type="string" _value="Factory for Nautilus component adapter factories "/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4" type="factory" location="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f">
+<oaf_server iid="OAFIID:Nautilus_Adapter_Factory" type="factory" location="OAFIID:Nautilus_Adapter_Factory_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
diff --git a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in
index 650c886f8..7867a6eda 100644
--- a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in
+++ b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in
@@ -1,7 +1,7 @@
 <oaf_info>
 
 
-<oaf_server iid="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" type="exe" location="nautilus-adapter">
+<oaf_server iid="OAFIID:Nautilus_Adapter_Factory_Factory" type="exe" location="nautilus-adapter">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -9,7 +9,7 @@
 	<oaf_attribute name="description" type="string" _value="Factory for Nautilus component adapter factories "/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4" type="factory" location="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f">
+<oaf_server iid="OAFIID:Nautilus_Adapter_Factory" type="factory" location="OAFIID:Nautilus_Adapter_Factory_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
diff --git a/components/adapter/main.c b/components/adapter/main.c
index 3af5bed7f..b6b51cbc0 100644
--- a/components/adapter/main.c
+++ b/components/adapter/main.c
@@ -41,8 +41,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define META_FACTORY_IID "OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f"
-#define FACTORY_OBJECT_IID    "OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4"
+#define META_FACTORY_IID   "OAFIID:Nautilus_Adapter_Factory_Factory"
+#define FACTORY_OBJECT_IID "OAFIID:Nautilus_Adapter_Factory"
 
 static int object_count = 0;
 
diff --git a/components/hardware/Nautilus_View_hardware.server.in b/components/hardware/Nautilus_View_hardware.server.in
index 329c64353..6db4a5fd2 100644
--- a/components/hardware/Nautilus_View_hardware.server.in
+++ b/components/hardware/Nautilus_View_hardware.server.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" type="exe" location="nautilus-hardware-view">
+<oaf_server iid="OAFIID:Nautilus_Hardware_View_Factory" type="exe" location="nautilus-hardware-view">
 	<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 hardware view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150" type="factory" location="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce">
+<oaf_server iid="OAFIID:Nautilus_Hardware_View" type="factory" location="OAFIID:Nautilus_Hardware_View_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/hardware/Nautilus_View_hardware.server.in.in b/components/hardware/Nautilus_View_hardware.server.in.in
index 329c64353..6db4a5fd2 100644
--- a/components/hardware/Nautilus_View_hardware.server.in.in
+++ b/components/hardware/Nautilus_View_hardware.server.in.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" type="exe" location="nautilus-hardware-view">
+<oaf_server iid="OAFIID:Nautilus_Hardware_View_Factory" type="exe" location="nautilus-hardware-view">
 	<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 hardware view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150" type="factory" location="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce">
+<oaf_server iid="OAFIID:Nautilus_Hardware_View" type="factory" location="OAFIID:Nautilus_Hardware_View_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/hardware/main.c b/components/hardware/main.c
index d0655404a..65c45cfd0 100644
--- a/components/hardware/main.c
+++ b/components/hardware/main.c
@@ -22,8 +22,8 @@
 
 /* main.c - main function and object activation function for the hardware view component. */
 
-#define FACTORY_IID	"OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" 
-#define VIEW_IID	"OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150"
+#define FACTORY_IID "OAFIID:Nautilus_Hardware_View_Factory" 
+#define VIEW_IID    "OAFIID:Nautilus_Hardware_View"
 
 #include <config.h>
 
diff --git a/components/history/Nautilus_View_history.server.in b/components/history/Nautilus_View_history.server.in
index 449ee219d..1d8e93deb 100644
--- a/components/history/Nautilus_View_history.server.in
+++ b/components/history/Nautilus_View_history.server.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view">
+<oaf_server iid="OAFIID:Nautilus_History_View_Factory" type="exe" location="nautilus-history-view">
 	<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 history views"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
+<oaf_server iid="OAFIID:Nautilus_History_View" type="factory" location="OAFIID:Nautilus_History_View_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/history/Nautilus_View_history.server.in.in b/components/history/Nautilus_View_history.server.in.in
index 449ee219d..1d8e93deb 100644
--- a/components/history/Nautilus_View_history.server.in.in
+++ b/components/history/Nautilus_View_history.server.in.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view">
+<oaf_server iid="OAFIID:Nautilus_History_View_Factory" type="exe" location="nautilus-history-view">
 	<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 history views"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
+<oaf_server iid="OAFIID:Nautilus_History_View" type="factory" location="OAFIID:Nautilus_History_View_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/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index acfe6c66e..c07a9fd94 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.c
@@ -41,8 +41,8 @@
 #include <libnautilus/nautilus-view.h>
 #include <libnautilus/nautilus-view-standard-main.h>
 
-#define FACTORY_IID	"OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e"
-#define VIEW_IID	"OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"
+#define FACTORY_IID "OAFIID:Nautilus_History_View_Factory"
+#define VIEW_IID    "OAFIID:Nautilus_History_View"
 
 #define NAUTILUS_TYPE_HISTORY_VIEW            (nautilus_history_view_get_type ())
 #define NAUTILUS_HISTORY_VIEW(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_HISTORY_VIEW, NautilusHistoryView))
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);
diff --git a/components/music/Nautilus_View_music.server.in b/components/music/Nautilus_View_music.server.in
index 51adb21ae..d1b58cf6f 100644
--- a/components/music/Nautilus_View_music.server.in
+++ b/components/music/Nautilus_View_music.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2" type="exe" location="nautilus-music-view">
+<oaf_server iid="OAFIID:Nautilus_Music_View_Factory" type="exe" location="nautilus-music-view">
 	<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="Factory for music view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391" type="factory" location="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2">
+<oaf_server iid="OAFIID:Nautilus_Music_View" type="factory" location="OAFIID:Nautilus_Music_View_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/music/Nautilus_View_music.server.in.in b/components/music/Nautilus_View_music.server.in.in
index 51adb21ae..d1b58cf6f 100644
--- a/components/music/Nautilus_View_music.server.in.in
+++ b/components/music/Nautilus_View_music.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2" type="exe" location="nautilus-music-view">
+<oaf_server iid="OAFIID:Nautilus_Music_View_Factory" type="exe" location="nautilus-music-view">
 	<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="Factory for music view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391" type="factory" location="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2">
+<oaf_server iid="OAFIID:Nautilus_Music_View" type="factory" location="OAFIID:Nautilus_Music_View_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/music/main.c b/components/music/main.c
index 8a05bc45b..5f43548a2 100644
--- a/components/music/main.c
+++ b/components/music/main.c
@@ -32,8 +32,8 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <eel/eel-debug.h>
 
-#define FACTORY_IID     "OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2"
-#define VIEW_IID        "OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391"
+#define VIEW_IID    "OAFIID:Nautilus_Music_View"
+#define FACTORY_IID "OAFIID:Nautilus_Music_View_Factory"
 
 int
 main (int argc, char *argv[])
diff --git a/components/news/Nautilus_View_news.server.in b/components/news/Nautilus_View_news.server.in
index 330904326..04b3277ac 100644
--- a/components/news/Nautilus_View_news.server.in
+++ b/components/news/Nautilus_View_news.server.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_news_view_factory:041601" type="exe" location="nautilus-news">
+<oaf_server iid="OAFIID:Nautilus_News_View_Factory" type="exe" location="nautilus-news">
 	<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 news view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_news_view:041601" type="factory" location="OAFIID:nautilus_news_view_factory:041601">
+<oaf_server iid="OAFIID:Nautilus_News_View" type="factory" location="OAFIID:Nautilus_News_View_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/news/nautilus-news.c b/components/news/nautilus-news.c
index f9c8ea5f1..a04061897 100644
--- a/components/news/nautilus-news.c
+++ b/components/news/nautilus-news.c
@@ -2549,8 +2549,8 @@ main(int argc, char *argv[])
                                             GNOMELOCALEDIR,
                                             argc,
                                             argv,
-                                            "OAFIID:nautilus_news_view_factory:041601",
-                                            "OAFIID:nautilus_news_view:041601",
+                                            "OAFIID:Nautilus_News_View_Factory",
+                                            "OAFIID:Nautilus_News_View",
                                             make_news_view,
                                             nautilus_global_preferences_init,
                                             NULL);
diff --git a/components/notes/Nautilus_View_notes.server.in b/components/notes/Nautilus_View_notes.server.in
index 9b1963af9..bbe9130fe 100644
--- a/components/notes/Nautilus_View_notes.server.in
+++ b/components/notes/Nautilus_View_notes.server.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="nautilus-notes">
+<oaf_server iid="OAFIID:Nautilus_Notes_View_Factory" type="exe" location="nautilus-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 annotation view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
+<oaf_server iid="OAFIID:Nautilus_Notes_View" type="factory" location="OAFIID:Nautilus_Notes_View_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/notes/Nautilus_View_notes.server.in.in b/components/notes/Nautilus_View_notes.server.in.in
index 9b1963af9..bbe9130fe 100644
--- a/components/notes/Nautilus_View_notes.server.in.in
+++ b/components/notes/Nautilus_View_notes.server.in.in
@@ -1,13 +1,13 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="nautilus-notes">
+<oaf_server iid="OAFIID:Nautilus_Notes_View_Factory" type="exe" location="nautilus-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 annotation view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
+<oaf_server iid="OAFIID:Nautilus_Notes_View" type="factory" location="OAFIID:Nautilus_Notes_View_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/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 23dabc101..895c6d28c 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -430,8 +430,8 @@ main(int argc, char *argv[])
                                             GNOMELOCALEDIR,
                                             argc,
                                             argv,
-                                            "OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
-                                            "OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185",
+                                            "OAFIID:Nautilus_Notes_View_Factory",
+                                            "OAFIID:Nautilus_Notes_View",
                                             make_notes_view,
                                             nautilus_global_preferences_init,
                                             NULL);
diff --git a/components/sample/Nautilus_View_sample.server.in b/components/sample/Nautilus_View_sample.server.in
index 97a2023ae..bd43e52ad 100644
--- a/components/sample/Nautilus_View_sample.server.in
+++ b/components/sample/Nautilus_View_sample.server.in
@@ -1,13 +1,20 @@
 <oaf_info>
 
-<!-- WHAT YOU NEED TO CHANGE: Replace all the OAFIID strings (you can
-     use `uuidgen' to generate the random number looking part).
-     Also make sure to replace the names, and change the mime/scheme attributes
-     and interfaces to what your component really supports.
-     And finally, make sure to remove the test_only attribute.
+<!-- WHAT YOU NEED TO CHANGE:
+
+  a) Replace all the OAFIID strings to do this you need to register
+     your namespace, and then generate some unique names inside
+     it. See libbonobo/doc/FAQ 'How should I create unique OAFIIDs for
+     components ?'.
+
+  b) Alter the repo_ids to the interfaces you support.
+
+  c) Point the 'location' at the executable that your project installs
+
+  d) And finally, make sure to remove the test_only attribute.
   -->
 
-<oaf_server iid="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5" type="exe" location="nautilus-sample-content-view">
+<oaf_server iid="OAFIID:Nautilus_Sample_Content_View_Factory" type="exe" location="nautilus-sample-content-view">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -15,7 +22,7 @@
 	<oaf_attribute name="description" type="string" _value="Sample content view component's factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae" type="factory" location="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5">
+<oaf_server iid="OAFIID:Nautilus_Sample_Content_View" type="factory" location="OAFIID:Nautilus_Sample_Content_View_Factory">
 	<oaf_attribute name="test_only" type="boolean" value="true"/>
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
diff --git a/components/sample/Nautilus_View_sample.server.in.in b/components/sample/Nautilus_View_sample.server.in.in
index 97a2023ae..bd43e52ad 100644
--- a/components/sample/Nautilus_View_sample.server.in.in
+++ b/components/sample/Nautilus_View_sample.server.in.in
@@ -1,13 +1,20 @@
 <oaf_info>
 
-<!-- WHAT YOU NEED TO CHANGE: Replace all the OAFIID strings (you can
-     use `uuidgen' to generate the random number looking part).
-     Also make sure to replace the names, and change the mime/scheme attributes
-     and interfaces to what your component really supports.
-     And finally, make sure to remove the test_only attribute.
+<!-- WHAT YOU NEED TO CHANGE:
+
+  a) Replace all the OAFIID strings to do this you need to register
+     your namespace, and then generate some unique names inside
+     it. See libbonobo/doc/FAQ 'How should I create unique OAFIIDs for
+     components ?'.
+
+  b) Alter the repo_ids to the interfaces you support.
+
+  c) Point the 'location' at the executable that your project installs
+
+  d) And finally, make sure to remove the test_only attribute.
   -->
 
-<oaf_server iid="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5" type="exe" location="nautilus-sample-content-view">
+<oaf_server iid="OAFIID:Nautilus_Sample_Content_View_Factory" type="exe" location="nautilus-sample-content-view">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
@@ -15,7 +22,7 @@
 	<oaf_attribute name="description" type="string" _value="Sample content view component's factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae" type="factory" location="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5">
+<oaf_server iid="OAFIID:Nautilus_Sample_Content_View" type="factory" location="OAFIID:Nautilus_Sample_Content_View_Factory">
 	<oaf_attribute name="test_only" type="boolean" value="true"/>
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
diff --git a/components/sample/main.c b/components/sample/main.c
index c08e2f3d1..5c3f83989 100644
--- a/components/sample/main.c
+++ b/components/sample/main.c
@@ -36,10 +36,10 @@
 #include <libnautilus/nautilus-view-standard-main.h>
 
 /* CHANGE: Replace these OAFIIDs with the new ones you put in the
- * .oafinfo file. 
+ * .server file. 
  */
-#define FACTORY_IID     "OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5"
-#define VIEW_IID        "OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae"
+#define FACTORY_IID "OAFIID:Nautilus_Sample_Content_View_Factory"
+#define VIEW_IID    "OAFIID:Nautilus_Sample_Content_View"
 
 /* CHANGE: Change to your executable name */
 #define EXECUTABLE_NAME "nautilus-sample-content-view"
diff --git a/components/text/Nautilus_View_text.server.in b/components/text/Nautilus_View_text.server.in
index 1ffb0f646..8d0de1072 100644
--- a/components/text/Nautilus_View_text.server.in
+++ b/components/text/Nautilus_View_text.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" type="exe" location="nautilus-text-view">
+<oaf_server iid="OAFIID:Nautilus_Text_View_Factory" type="exe" location="nautilus-text-view">
 	<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="Factory for text view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21">
+<oaf_server iid="OAFIID:Nautilus_Text_View" type="factory" location="OAFIID:Nautilus_Text_View_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/text/Nautilus_View_text.server.in.in b/components/text/Nautilus_View_text.server.in.in
index 1ffb0f646..8d0de1072 100644
--- a/components/text/Nautilus_View_text.server.in.in
+++ b/components/text/Nautilus_View_text.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" type="exe" location="nautilus-text-view">
+<oaf_server iid="OAFIID:Nautilus_Text_View_Factory" type="exe" location="nautilus-text-view">
 	<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="Factory for text view"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21">
+<oaf_server iid="OAFIID:Nautilus_Text_View" type="factory" location="OAFIID:Nautilus_Text_View_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/text/main.c b/components/text/main.c
index 47b23fe0c..ab374f47c 100644
--- a/components/text/main.c
+++ b/components/text/main.c
@@ -32,8 +32,8 @@
 #include <libnautilus/nautilus-view-standard-main.h>
 #include <eel/eel-debug.h>
 
-#define FACTORY_IID       "OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21"
-#define VIEW_IID          "OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437"
+#define FACTORY_IID "OAFIID:Nautilus_Text_View_Factory"
+#define VIEW_IID    "OAFIID:Nautilus_Text_View"
 
 int
 main (int argc, char *argv[])
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index 8c7778fcb..13c118253 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -36,8 +36,8 @@
 #include <libnautilus/nautilus-view.h>
 #include <libnautilus/nautilus-view-standard-main.h>
 
-#define FACTORY_IID "OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21"
-#define VIEW_IID "OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" 
+#define VIEW_IID    "OAFIID:Nautilus_Text_View" 
+#define FACTORY_IID "OAFIID:Nautilus_Text_View_Factory"
 
 typedef struct {
 	NautilusView base;
@@ -248,6 +248,3 @@ main (int argc, char *argv[])
                                             NULL,
                                             nautilus_text_view_get_type);
 }
-
-
-
diff --git a/components/throbber/Nautilus_Control_throbber.server.in b/components/throbber/Nautilus_Control_throbber.server.in
index 650a13dd2..44f335af8 100644
--- a/components/throbber/Nautilus_Control_throbber.server.in
+++ b/components/throbber/Nautilus_Control_throbber.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_throbber_factory" type="exe" location="nautilus-throbber">
+<oaf_server iid="OAFIID:Nautilus_Throbber_Factory" type="exe" location="nautilus-throbber">
 	<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="throbber object factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_throbber" type="factory" location="OAFIID:nautilus_throbber_factory">
+<oaf_server iid="OAFIID:Nautilus_Throbber" type="factory" location="OAFIID:Nautilus_Throbber_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/throbber/Nautilus_Control_throbber.server.in.in b/components/throbber/Nautilus_Control_throbber.server.in.in
index 650a13dd2..44f335af8 100644
--- a/components/throbber/Nautilus_Control_throbber.server.in.in
+++ b/components/throbber/Nautilus_Control_throbber.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_throbber_factory" type="exe" location="nautilus-throbber">
+<oaf_server iid="OAFIID:Nautilus_Throbber_Factory" type="exe" location="nautilus-throbber">
 	<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="throbber object factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_throbber" type="factory" location="OAFIID:nautilus_throbber_factory">
+<oaf_server iid="OAFIID:Nautilus_Throbber" type="factory" location="OAFIID:Nautilus_Throbber_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/throbber/main.c b/components/throbber/main.c
index b95b27def..7edd840b4 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -29,8 +29,8 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus/nautilus-view-standard-main.h>
 
-#define FACTORY_IID "OAFIID:nautilus_throbber_factory"
-#define VIEW_IID    "OAFIID:nautilus_throbber"
+#define FACTORY_IID "OAFIID:Nautilus_Throbber_Factory"
+#define VIEW_IID    "OAFIID:Nautilus_Throbber"
 
 static BonoboObject *
 cb_create_throbber (const char *ignore0, void *ignore1)
diff --git a/components/tree/Nautilus_View_tree.server.in b/components/tree/Nautilus_View_tree.server.in
index 8db9d74a0..7e862c91b 100644
--- a/components/tree/Nautilus_View_tree.server.in
+++ b/components/tree/Nautilus_View_tree.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="shlib" location="libnautilus-tree-view.so">
+<oaf_server iid="OAFIID:Nautilus_Tree_View" type="shlib" location="libnautilus-tree-view.so">
 	<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/tree/Nautilus_View_tree.server.in.in b/components/tree/Nautilus_View_tree.server.in.in
index 8db9d74a0..7e862c91b 100644
--- a/components/tree/Nautilus_View_tree.server.in.in
+++ b/components/tree/Nautilus_View_tree.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="shlib" location="libnautilus-tree-view.so">
+<oaf_server iid="OAFIID:Nautilus_Tree_View" type="shlib" location="libnautilus-tree-view.so">
 	<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/tree/nautilus-tree-view-iids.h b/components/tree/nautilus-tree-view-iids.h
index 9cb44e826..e9309a6d5 100644
--- a/components/tree/nautilus-tree-view-iids.h
+++ b/components/tree/nautilus-tree-view-iids.h
@@ -26,10 +26,7 @@
 #ifndef NAUTILUS_TREE_VIEW_IIDS_H
 #define NAUTILUS_TREE_VIEW_IIDS_H
 
-
-#define TREE_VIEW_IID "OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d"
-
-#define TREE_VIEW_FACTORY_IID "OAFIID:nautilus_tree_view_factory:79f93d13-d404-4ef6-8de2-b8a0045a96ab"
-
+#define TREE_VIEW_IID         "OAFIID:Nautilus_Tree_View"
+#define TREE_VIEW_FACTORY_IID "OAFIID:Nautilus_Tree_View_Factory"
 
 #endif /* NAUTILUS_TREE_VIEW_IIDS_H */
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 85957babf..4bbe1dbe4 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -106,8 +106,8 @@ enum
 };
 
 /* These IIDs are used by the preferences code and in nautilus-application.c */
-#define NAUTILUS_ICON_VIEW_IID	     "OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058"
-#define NAUTILUS_LIST_VIEW_IID	     "OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c"
+#define NAUTILUS_ICON_VIEW_IID	     "OAFIID:Nautilus_File_Manager_Icon_View"
+#define NAUTILUS_LIST_VIEW_IID	     "OAFIID:Nautilus_File_Manager_List_View"
 
 
 /* Icon View */
diff --git a/libnautilus-private/nautilus-metafile-factory.h b/libnautilus-private/nautilus-metafile-factory.h
index 0b3d3f92d..379fb95a0 100644
--- a/libnautilus-private/nautilus-metafile-factory.h
+++ b/libnautilus-private/nautilus-metafile-factory.h
@@ -47,8 +47,7 @@ typedef struct {
 
 GType nautilus_metafile_factory_get_type (void);
 
-
-#define METAFILE_FACTORY_IID "OAFIID:nautilus_metafile_factory:bc318c01-4106-4622-8d6c-b419ec89e4c6"
+#define METAFILE_FACTORY_IID "OAFIID:Nautilus_Metafile_Factory"
 
 NautilusMetafileFactory *nautilus_metafile_factory_get_instance (void);
 
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index ef9a56147..276e7d155 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -1537,16 +1537,18 @@ server_matches_content_requirements (Bonobo_ServerInfo *server,
 }
 
 
+/* FIXME: do we actually need this it would seem to me that the
+ * test_only attribute handles this
+ */
 static char *nautilus_sort_criteria[] = {
         /* Prefer anything else over the loser view. */
-        "iid != 'OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d'",
+        "iid != 'OAFIID:Nautilus_Content_Loser'",
         /* Prefer anything else over the sample view. */
-        "iid != 'OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae'",
+        "iid != 'OAFIID:Nautilus_Sample_Content_View'",
 	/* Sort alphabetically */
 	"name",
-        NULL};
-
-
+        NULL
+};
 
 static GList *
 nautilus_do_component_query (const char        *mime_type, 
@@ -1596,10 +1598,7 @@ nautilus_do_component_query (const char        *mime_type,
 
                         if (ignore_content_mime_types || 
 			    server_matches_content_requirements (server, content_types, explicit_iids)) {
-                                /* Hack to suppress the Bonobo_Sample_Text component, since the Nautilus text
-                                 * view is a superset and it's confusing for the user to be presented with both
-                                 */
-                                if (server->iid != NULL && strcmp (server->iid, "OAFIID:Bonobo_Sample_Text") != 0) {
+                                if (server->iid != NULL) {
                                 	retval = g_list_prepend
                                         	(retval, 
 						 Bonobo_ServerInfo_duplicate (server));
diff --git a/libnautilus-private/nautilus-sidebar-functions.c b/libnautilus-private/nautilus-sidebar-functions.c
index 0ba00c8aa..b95977167 100644
--- a/libnautilus-private/nautilus-sidebar-functions.c
+++ b/libnautilus-private/nautilus-sidebar-functions.c
@@ -32,10 +32,10 @@
 
 #define PREFERENCES_SIDEBAR_PANEL_PREFIX "sidebar-panels"
 
-#define NEWS_PANEL_IID		"OAFIID:nautilus_news_view:041601"
-#define NOTES_PANEL_IID		"OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185"
-#define HISTORY_PANEL_IID	"OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"
-#define TREE_PANEL_IID		"OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d"
+#define NEWS_PANEL_IID		"OAFIID:Nautilus_News_View"
+#define NOTES_PANEL_IID		"OAFIID:Nautilus_Notes_View"
+#define HISTORY_PANEL_IID	"OAFIID:Nautilus_History_View"
+#define TREE_PANEL_IID		"OAFIID:Nautilus_Tree_View"
 
 const char nautilus_sidebar_news_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" NEWS_PANEL_IID;
 const char nautilus_sidebar_notes_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" NOTES_PANEL_IID;
diff --git a/src/Nautilus_shell.server.in b/src/Nautilus_shell.server.in
index 2467c09c7..07229bec2 100644
--- a/src/Nautilus_shell.server.in
+++ b/src/Nautilus_shell.server.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus">
+<oaf_server iid="OAFIID:Nautilus_Factory" type="exe" location="nautilus">
   <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="Factory for Nautilus shell and file manager"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+<oaf_server iid="OAFIID:Nautilus_File_Manager_Icon_View" type="factory" location="OAFIID:Nautilus_Factory">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Bonobo/Control:1.0"/>
@@ -30,7 +30,7 @@
   <oaf_attribute name="nautilus:viewer_label" type="string" _value="Icons Viewer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_desktop_icon_view:8d8121b1-0f1e-400b-bf0d-5b0f4555f5e1" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+<oaf_server iid="OAFIID:Nautilus_File_Manager_Desktop_Icon_View" type="factory" location="OAFIID:Nautilus_Factory">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Bonobo/Control:1.0"/>
@@ -41,7 +41,7 @@
   <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows icons on the desktop"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+<oaf_server iid="OAFIID:Nautilus_File_Manager_List_View" type="factory" location="OAFIID:Nautilus_Factory">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Bonobo/Control:1.0"/>
@@ -64,7 +64,7 @@
   <oaf_attribute name="nautilus:viewer_label" type="string" _value="List Viewer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_search_list_view:b186e381-198e-43cf-9c46-60b6bb35db0b" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+<oaf_server iid="OAFIID:Nautilus_File_Manager_Search_List_View" type="factory" location="OAFIID:Nautilus_Factory">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Bonobo/Control:1.0"/>
@@ -81,7 +81,7 @@
   <oaf_attribute name="nautilus:viewer_label" type="string" value="Search List Viewer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_shell:cd5183b2-3913-4b74-9b8e-10528b0de08d" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+<oaf_server iid="OAFIID:Nautilus_Shell" type="factory" location="OAFIID:Nautilus_Factory">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Nautilus/Shell:1.0"/>
@@ -90,7 +90,7 @@
   <oaf_attribute name="description" type="string" _value="Nautilus shell operations that can be done from subsequent command-line invocations"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_metafile_factory:bc318c01-4106-4622-8d6c-b419ec89e4c6" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+<oaf_server iid="OAFIID:Nautilus_Metafile_Factory" type="factory" location="OAFIID:Nautilus_Factory">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Nautilus/MetafileFactory:1.0"/>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 06492c13b..7ce3451c8 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -70,9 +70,9 @@
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 
-#define FACTORY_IID	     "OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"
-#define SEARCH_LIST_VIEW_IID "OAFIID:nautilus_file_manager_search_list_view:b186e381-198e-43cf-9c46-60b6bb35db0b"
-#define SHELL_IID	     "OAFIID:nautilus_shell:cd5183b2-3913-4b74-9b8e-10528b0de08d"
+#define FACTORY_IID	     "OAFIID:Nautilus_Factory"
+#define SEARCH_LIST_VIEW_IID "OAFIID:Nautilus_File_Manager_Search_List_View"
+#define SHELL_IID	     "OAFIID:Nautilus_Shell"
 
 /* Keeps track of the one and only desktop window. */
 static NautilusDesktopWindow *nautilus_application_desktop_window;
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index d9254a193..818a86503 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -30,7 +30,7 @@
 #include <bonobo/bonobo-generic-factory.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
 
-#define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:nautilus_file_manager_desktop_icon_view:8d8121b1-0f1e-400b-bf0d-5b0f4555f5e1"
+#define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Icon_View"
 
 #define NAUTILUS_TYPE_APPLICATION	     (nautilus_application_get_type ())
 #define NAUTILUS_APPLICATION(obj)	     (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_APPLICATION, NautilusApplication))
diff --git a/src/nautilus-component-adapter-factory.c b/src/nautilus-component-adapter-factory.c
index 9b4fa4837..c2781822d 100644
--- a/src/nautilus-component-adapter-factory.c
+++ b/src/nautilus-component-adapter-factory.c
@@ -36,7 +36,7 @@
 #include <libgnome/gnome-macros.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
 
-#define NAUTILUS_COMPONENT_ADAPTER_FACTORY_IID "OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4"
+#define NAUTILUS_COMPONENT_ADAPTER_FACTORY_IID "OAFIID:Nautilus_Adaptor_Factory"
 
 struct NautilusComponentAdapterFactoryDetails {
 	Nautilus_ComponentAdapterFactory corba_factory;
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 67042aa8d..c2219a4e9 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -444,6 +444,22 @@ throbber_callback (BonoboListener *listener,
 }
 
 static void
+throbber_set_throbbing (NautilusWindow *window,
+			gboolean        throbbing)
+{
+	CORBA_boolean b;
+	CORBA_any     val;
+
+	val._type = TC_CORBA_boolean;
+	val._value = &b;
+	b = throbbing;
+
+	eel_bonobo_pbclient_set_value_async (
+		window->details->throbber_property_bag,
+		"throbbing", &val, NULL);
+}
+
+static void
 throbber_created_callback (Bonobo_Unknown     throbber,
 			   CORBA_Environment *ev,
 			   gpointer           user_data)
@@ -474,10 +490,7 @@ throbber_created_callback (Bonobo_Unknown     throbber,
 		window->details->throbber_property_bag = CORBA_OBJECT_NIL;
 		CORBA_exception_free (ev);
 	} else {
-		bonobo_pbclient_set_boolean (window->details->throbber_property_bag,
-					     "throbbing",
-					     window->details->throbber_active,
-					     ev);
+		throbber_set_throbbing (window, window->details->throbber_active);
 	}
 
 	window->details->throbber_listener =
@@ -494,8 +507,6 @@ throbber_created_callback (Bonobo_Unknown     throbber,
 void
 nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
 {
-	CORBA_Environment ev;
-	
 	if (( window->details->throbber_active &&  allow) ||
 	    (!window->details->throbber_active && !allow)) {
 		return;
@@ -514,10 +525,7 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
 				       NAUTILUS_COMMAND_STOP, allow);
 
 	if (window->details->throbber_property_bag != CORBA_OBJECT_NIL) {
-		CORBA_exception_init (&ev);
-		bonobo_pbclient_set_boolean (window->details->throbber_property_bag,
-					     "throbbing", allow, &ev);
-		CORBA_exception_free (&ev);
+		throbber_set_throbbing (window, allow);
 	}
 
 	nautilus_window_ui_thaw (window);
@@ -539,7 +547,7 @@ nautilus_window_initialize_toolbars (NautilusWindow *window)
 		CORBA_exception_init (&ev);
 
 		g_object_ref (window);
-		bonobo_get_object_async ("OAFIID:nautilus_throbber",
+		bonobo_get_object_async ("OAFIID:Nautilus_Throbber",
 					 "IDL:Bonobo/Control:1.0",
 					 &ev,
 					 throbber_created_callback,
author	Michael Meeks <michael@ximian.com>	2002-04-18 18:39:01 +0000
committer	Michael Meeks <michael@src.gnome.org>	2002-04-18 18:39:01 +0000
commit	e72152dd8e25e3d6309cbf2928e240fc99e1dd72 (patch)
tree	aa041c91718519fd813ab3edd95d6cc2315fd357
parent	2af5520c56649f581d316824cdbaaafe80d3d2d1 (diff)
download	nautilus-e72152dd8e25e3d6309cbf2928e240fc99e1dd72.tar.gz