re-remove the per display IID creation scheme - it's broken.

2002-01-23  Michael Meeks  <michael@ximian.com>

	* libnautilus/nautilus-view-standard-main.c
	(nautilus_view_standard_main_multi): re-remove the
	per display IID creation scheme - it's broken.

	* components/throbber/nautilus-throbber.c
	(nautilus_throbber_draw): kill, no draw methods
	in gtk 2.0
	(draw_throbber_image): remove bonobo bug
	workaround, if it still exists it should be fixed
	in bonobo and fold into
	(nautilus_throbber_expose): here
	(draw_pixbuf): fold into
	(nautilus_throbber_expose): here, and fix
	rendering bugs.
	(nautilus_throbber_size_allocate): kill bogus
	sizing logic.
	(nautilus_throbber_button_release_event): do
	conversion.
	(nautilus_throbber_destroy): remove
	force_destroy_later.

2002-01-21  Michael Meeks  <michael@ximian.com>

	* src/nautilus-window.c,
	* src/nautilus-application.c,
	* src/nautilus-view-frame.c,
	* libnautilus-private/nautilus-undo-manager.c,
	* libnautilus-private/nautilus-metafile-factory.c,
	* libnautilus/nautilus-undo-transaction.c,
	s/bonobo_object_corba_objref/BONOBO_OBJREF/

	* libnautilus-private/nautilus-directory-metafile.c
	(get_factory): update referencing.

	* libnautilus/nautilus-view.c
	(nautilus_view_get_view_frame): impl. helper to
	reduce sync CORBA traffic.
	(view_frame_call_end, view_frame_call_begin): upd.
	(nautilus_view_dispose): release the CORBA ref. if we
	took it.
	(nautilus_view_set_frame): unset the frame if we
	loose it.

	* libnautilus-private/nautilus-bonobo-extensions.c
	(add_numbered_menu_item_internal): kill the label encoding.
	(nautilus_bonobo_add_submenu): ditto.
	(nautilus_bonobo_set_icon): kill unused.

	* components/adaptor/bonobo-stream-vfs.[ch]: remove, now
	inside gnome-vfs.

6 files changed, 14 insertions, 14 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index ce774472a..baf65af3f 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -127,7 +127,7 @@ create_object (PortableServer_Servant servant,
 		return CORBA_OBJECT_NIL;
 	}
 
-	return CORBA_Object_duplicate (bonobo_object_corba_objref (object), ev);
+	return CORBA_Object_duplicate (BONOBO_OBJREF (object), ev);
 }
 
 GList *
@@ -445,9 +445,9 @@ nautilus_application_startup (NautilusApplication *application,
 	/* Start up the factory. */
 	while (TRUE) {
 		/* Try to register the file manager view factory. */
-		result = bonobo_activation_active_server_register
-			(FACTORY_IID,
-			 bonobo_object_corba_objref (BONOBO_OBJECT (application)));
+		result = bonobo_activation_active_server_register (
+			FACTORY_IID, BONOBO_OBJREF (application));
+
 		switch (result) {
 		case Bonobo_ACTIVATION_REG_SUCCESS:
 			/* We are registered and all is right with the world. */
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 44c8542a7..36e356b24 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -733,7 +733,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	location_bar_wrapper = bonobo_control_new (location_bar_box);
 	bonobo_ui_component_object_set (window->details->shell_ui,
 					"/Location Bar/Wrapper",
-					bonobo_object_corba_objref (BONOBO_OBJECT (location_bar_wrapper)),
+					BONOBO_OBJREF (location_bar_wrapper),
 					NULL);
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 	bonobo_object_unref (BONOBO_OBJECT (location_bar_wrapper));
@@ -2198,7 +2198,7 @@ nautilus_window_get_ui_container (NautilusWindow *window)
 {
 	g_return_val_if_fail (NAUTILUS_IS_WINDOW (window), CORBA_OBJECT_NIL);
 
-	return bonobo_object_corba_objref (BONOBO_OBJECT (window->details->ui_container));
+	return BONOBO_OBJREF (window->details->ui_container);
 }
 
 void
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 44c8542a7..36e356b24 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -733,7 +733,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	location_bar_wrapper = bonobo_control_new (location_bar_box);
 	bonobo_ui_component_object_set (window->details->shell_ui,
 					"/Location Bar/Wrapper",
-					bonobo_object_corba_objref (BONOBO_OBJECT (location_bar_wrapper)),
+					BONOBO_OBJREF (location_bar_wrapper),
 					NULL);
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 	bonobo_object_unref (BONOBO_OBJECT (location_bar_wrapper));
@@ -2198,7 +2198,7 @@ nautilus_window_get_ui_container (NautilusWindow *window)
 {
 	g_return_val_if_fail (NAUTILUS_IS_WINDOW (window), CORBA_OBJECT_NIL);
 
-	return bonobo_object_corba_objref (BONOBO_OBJECT (window->details->ui_container));
+	return BONOBO_OBJREF (window->details->ui_container);
 }
 
 void
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 44c8542a7..36e356b24 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -733,7 +733,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	location_bar_wrapper = bonobo_control_new (location_bar_box);
 	bonobo_ui_component_object_set (window->details->shell_ui,
 					"/Location Bar/Wrapper",
-					bonobo_object_corba_objref (BONOBO_OBJECT (location_bar_wrapper)),
+					BONOBO_OBJREF (location_bar_wrapper),
 					NULL);
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 	bonobo_object_unref (BONOBO_OBJECT (location_bar_wrapper));
@@ -2198,7 +2198,7 @@ nautilus_window_get_ui_container (NautilusWindow *window)
 {
 	g_return_val_if_fail (NAUTILUS_IS_WINDOW (window), CORBA_OBJECT_NIL);
 
-	return bonobo_object_corba_objref (BONOBO_OBJECT (window->details->ui_container));
+	return BONOBO_OBJREF (window->details->ui_container);
 }
 
 void
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index b8989fe50..e22b8c310 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -592,8 +592,8 @@ create_corba_objects (NautilusViewFrame *view)
 	control = Bonobo_Unknown_queryInterface
 		(view->details->view, "IDL:Bonobo/Control:1.0", &ev);
 	g_assert (ev._major == CORBA_NO_EXCEPTION);
-	view->details->control_frame = bonobo_control_frame_new
-		(bonobo_object_corba_objref (BONOBO_OBJECT (view->details->ui_container)));
+	view->details->control_frame = bonobo_control_frame_new (
+		BONOBO_OBJREF (view->details->ui_container));
 
 	bonobo_control_frame_set_propbag (
 		view->details->control_frame,
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 44c8542a7..36e356b24 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -733,7 +733,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	location_bar_wrapper = bonobo_control_new (location_bar_box);
 	bonobo_ui_component_object_set (window->details->shell_ui,
 					"/Location Bar/Wrapper",
-					bonobo_object_corba_objref (BONOBO_OBJECT (location_bar_wrapper)),
+					BONOBO_OBJREF (location_bar_wrapper),
 					NULL);
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 	bonobo_object_unref (BONOBO_OBJECT (location_bar_wrapper));
@@ -2198,7 +2198,7 @@ nautilus_window_get_ui_container (NautilusWindow *window)
 {
 	g_return_val_if_fail (NAUTILUS_IS_WINDOW (window), CORBA_OBJECT_NIL);
 
-	return bonobo_object_corba_objref (BONOBO_OBJECT (window->details->ui_container));
+	return BONOBO_OBJREF (window->details->ui_container);
 }
 
 void