Tell everyone that we are back on bonobo HEAD. Make sure Nautilus doesn't

	* README: Tell everyone that we are back on bonobo HEAD.
	* configure.in: Make sure Nautilus doesn't try to compile with the
	old bonobo.

	* components/adapter/nautilus-adapter-embed-strategy.c:
	(nautilus_adapter_embed_strategy_get):
	* components/adapter/nautilus-adapter-load-strategy.c:
	(nautilus_adapter_load_strategy_get):
	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
	(nautilus_adapter_progressive_load_strategy_load_location):
	* components/history/nautilus-history-view.c:
	(history_view_frame_call_begin):
	* libnautilus/nautilus-undo.c: (set_up_bonobo_control):
	* libnautilus/nautilus-view.c: (view_frame_call_begin):
	* libnautilus/nautilus-zoomable.c:
	(nautilus_zoomable_ensure_zoomable_frame):
	Fix all the callers of query_interface in CORBA to call it
	queryInterface (I used the Bonobo script to do it).

	* src/nautilus-window.h:
	* src/nautilus-window.c: (nautilus_window_constructed),
	(nautilus_window_set_arg), (nautilus_window_get_arg),
	(nautilus_window_set_content_view_widget): Update for BonoboWin ->
	BonoboWindow change. Once again, the change was done by the Bonobo
	script (but I had to undo the spaces it ate after BONOBO_WIN).

	* components/services/install/idl/trilobite-eazel-install.idl:
	* components/services/time/idl/trilobite-eazel-time-service.idl:
	* components/services/trilobite/idl/trilobite-service.idl:
	* components/services/trilobite/sample/idl/sample-service.idl:
	* libnautilus-adapter/nautilus-adapter-factory.idl:
	* libnautilus/nautilus-distributed-undo.idl:
	* libnautilus/nautilus-view-component.idl:
	Since IDL dependencies don't work, I touched every IDL file to
	make the switchover smoother. This only works if people update
	before they try to build and fail, otherwise they need to do:
		find -name '*.xml' | xargs touch
	(Maciej and I want to add dependency support to orbit-idl to make
	this problem go away long term).

	* src/nautilus-desktop-window.c: (realize):
	The script updated this comment to, so I let it.

	* user-guide/C/Makefile.am: Took out the botched change I made to
	this file. Mathieu did the correct one.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index dceca37cb..f1804d596 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -125,7 +125,7 @@ static void nautilus_window_real_load_content_view_menu (NautilusFile    *file,
 
 NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
 				   nautilus_window,
-				   BONOBO_TYPE_WIN)
+				   BONOBO_TYPE_WINDOW)
 
 static void
 nautilus_window_initialize_class (NautilusWindowClass *klass)
@@ -341,7 +341,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	/* CORBA and Bonobo setup, which must be done before the location bar setup */
 	window->details->ui_container = bonobo_ui_container_new ();
 	bonobo_ui_container_set_win (window->details->ui_container,
-				     BONOBO_WIN (window));
+				     BONOBO_WINDOW(window));
 
 	/* Load the user interface from the XML file. */
 	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
@@ -420,7 +420,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
 	}
 	gtk_widget_show (window->content_hbox);
-	bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
+	bonobo_window_set_contents (BONOBO_WINDOW(window), window->content_hbox);
 	
 	/* set up the index panel */
 	
@@ -496,8 +496,8 @@ nautilus_window_set_arg (GtkObject *object,
 		if (GTK_VALUE_STRING (*arg) == NULL) {
 			return;
 		}
-		old_name = bonobo_win_get_name (BONOBO_WIN (object));
-		bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg));
+		old_name = bonobo_window_get_name (BONOBO_WINDOW(object));
+		bonobo_window_set_name (BONOBO_WINDOW(object), GTK_VALUE_STRING (*arg));
 		/* This hack of using the time when the name first
 		 * goes non-NULL to be window-constructed time is
 		 * completely lame. But it works, so for now we leave
@@ -521,7 +521,7 @@ nautilus_window_get_arg (GtkObject *object,
 {
 	switch(arg_id) {
 	case ARG_APP_ID:
-		GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
+		GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW(object));
 		break;
 	case ARG_APP:
 		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
@@ -1420,7 +1420,7 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 	}
 
 	/* Here's an explicit check for a problem that happens all too often. */
-	if (bonobo_win_xml_node_exists (BONOBO_WIN (window),
+	if (bonobo_window_xml_node_exists (BONOBO_WINDOW(window),
 					"/menu/File/Open Placeholder/Open")) {
 		g_warning ("There's a lingering Open menu item. "
 			   "This usually means a new Bonobo bug.");