Cut over to HEAD of Bonobo. This check-in includes all the changes

	needed to compile and run, but there are many things wrong
	visually that may take a while to get fixed.

	* src/nautilus-window-menus.c: (file_menu_new_window_callback),
	(file_menu_close_window_callback),
	(file_menu_close_all_windows_callback),
	(file_menu_toggle_find_mode_callback),
	(file_menu_web_search_callback), (edit_menu_undo_callback),
	(edit_menu_cut_callback), (edit_menu_copy_callback),
	(edit_menu_paste_callback), (edit_menu_clear_callback),
	(go_menu_back_callback), (go_menu_forward_callback),
	(go_menu_up_callback), (go_menu_home_callback),
	(go_menu_forget_history_callback), (view_menu_reload_callback),
	(view_menu_show_hide_sidebar_callback),
	(view_menu_show_hide_tool_bar_callback),
	(view_menu_show_hide_location_bar_callback),
	(view_menu_show_hide_status_bar_callback),
	(nautilus_window_update_show_hide_menu_items),
	(view_menu_zoom_in_callback), (view_menu_zoom_out_callback),
	(view_menu_zoom_normal_callback),
	(bookmarks_menu_add_bookmark_callback),
	(bookmarks_menu_edit_bookmarks_callback),
	(user_level_customize_callback), (customize_callback),
	(change_appearance_callback), (help_menu_about_nautilus_callback),
	(help_menu_nautilus_feedback_callback), (switch_to_user_level),
	(user_level_menu_item_callback), (append_placeholder),
	(append_separator), (append_bookmark_to_menu),
	(create_menu_item_from_node), (remove_bookmarks_after),
	(remove_underline_accelerator_from_menu_title),
	(new_top_level_menu), (add_user_level_menu_item),
	(nautilus_window_initialize_menus),
	(nautilus_window_update_find_menu_item),
	(update_user_level_menu_items), (convert_verb_to_user_level),
	(convert_user_level_to_verb), (update_preferences_dialog_title):
	* src/nautilus-window.c: (nautilus_window_clear_status),
	(nautilus_window_set_status), (install_status_bar),
	(nautilus_window_constructed), (nautilus_window_set_arg),
	(nautilus_window_get_arg), (nautilus_window_destroy),
	(nautilus_window_allow_back), (nautilus_window_allow_forward),
	(nautilus_window_allow_up), (nautilus_window_allow_reload),
	(nautilus_window_zoom_level_changed_callback),
	(nautilus_window_set_content_view_widget), (show_dock_item),
	(hide_dock_item), (dock_item_showing),
	(nautilus_window_hide_tool_bar), (nautilus_window_show_tool_bar),
	(nautilus_window_tool_bar_showing),
	(nautilus_window_hide_status_bar),
	(nautilus_window_show_status_bar),
	(nautilus_window_status_bar_showing):
	Convert to new API. Some is disabled with #ifdef UIH.

	* Makefile.am:
	* configure.in:
	Turned off build of the idl directory, build components after src.

	* components/adapter/main.c:
	* components/notes/nautilus-notes.c:
	* components/sample/main.c:
	* libnautilus-extensions/nautilus-font-picker.c:
	* libnautilus-extensions/nautilus-global-preferences.c:
	* libnautilus-extensions/nautilus-password-dialog.c:
	* libnautilus-extensions/nautilus-preferences-item.c:
	* libnautilus/nautilus-undo-transaction.c:
	* libnautilus/nautilus-undo.c:
	* src/nautilus-application.c:
	* src/nautilus-history-frame.c:
	* src/nautilus-link-set-window.c:
	* src/nautilus-main.c:
	* src/nautilus-shell.c:
	* src/nautilus-sidebar.c:
	* src/nautilus-view-frame-corba.c:
	* src/nautilus-zoomable-frame-corba.c:
	* test/test-nautilus-font-picker.c:
	* test/test-nautilus-image.c: (create_font_picker_frame):
	* test/test-nautilus-label.c: (create_font_picker_frame):
	* test/test-nautilus-preferences.c:
	* test/test-nautilus-widgets.c: (radio_group_load_it_up):
	Fixed includes.

	* test/test-nautilus-image.c: (create_font_picker_frame):
	* test/test-nautilus-label.c: (create_font_picker_frame):
	* test/test-nautilus-widgets.c: (radio_group_load_it_up):
	Turned off localization of some strings in tests.

	* components/adapter/nautilus-adapter-control-embed-strategy.c:
	(nautilus_adapter_control_embed_strategy_new):
	* components/adapter/nautilus-adapter-control-embed-strategy.h:
	* components/adapter/nautilus-adapter-embed-strategy.c:
	(nautilus_adapter_embed_strategy_get):
	* components/adapter/nautilus-adapter-embed-strategy.h:
	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
	(nautilus_adapter_embeddable_embed_strategy_new):
	* components/adapter/nautilus-adapter-embeddable-embed-strategy.h:
	Embedding code now deals with Bonobo_UIContainer, not
	Bonobo_UIHandler.

	* components/adapter/nautilus-adapter.c: (nautilus_adapter_new):
	This code not only had to be changed to deal with the
	Bonobo_UIContainer instead of Bonobo_UIHandler, but it also needed
	to deal with the containing item (was remote_ui_handler), not the
	local component.

	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
	(nautilus_adapter_embeddable_embed_strategy_new):
	* components/adapter/nautilus-adapter.c:
	BonoboContainer was renamed BonoboItemContainer.

	* components/history/nautilus-history-view.c:
	Remove unused BonoboUIHandler * field.

	* components/loser/content/Makefile.am:
	* components/loser/sidebar/Makefile.am:
	* components/mozilla/Makefile.am:
	* components/sample/Makefile.am:
	* src/Makefile.am:
	* src/file-manager/Makefile.am:
	Added the necessary defines and build rules to install ui.xml
	files and locate them from the C code.

	* src/file-manager/nautilus-directory-view-ui.xml:
	* src/file-manager/nautilus-icon-view-ui.xml:
	* src/file-manager/nautilus-search-list-view-ui.xml:
	* src/nautilus-shell-ui.xml:
	Added definitions of user interface.

	* components/loser/content/nautilus-content-loser-ui.xml:
	* components/loser/sidebar/nautilus-sidebar-loser-ui.xml:
	* components/mozilla/nautilus-mozilla-ui.xml:
	* components/sample/nautilus-sample-content-view-ui.xml:
	Added empty placeholders for user interface.

	* components/loser/content/nautilus-content-loser.c:
	(loser_merge_bonobo_items_callback):
	* components/loser/sidebar/nautilus-sidebar-loser.c:
	(loser_merge_bonobo_items_callback):
	* components/mozilla/nautilus-mozilla-content-view.c:
	(mozilla_merge_bonobo_items_callback):
	* components/sample/nautilus-sample-content-view.c:
	(sample_merge_bonobo_items_callback):
	Use nautilus_view_set_up_ui to get the user interface from a
	ui.xml file. Put #ifdef UIH around old code to make the items work
	that still needs to be visited.

	* libnautilus-extensions/nautilus-bonobo-extensions.c:
	* libnautilus-extensions/nautilus-bonobo-extensions.h:
	* libnautilus-extensions/nautilus-undo-manager.c:
	* libnautilus-extensions/nautilus-undo-manager.h:
	* libnautilus/nautilus-clipboard.c: (add_menu_items_callback),
	(remove_menu_items_callback),
	(nautilus_clipboard_set_up_editable_from_bonobo_control):
	* libnautilus/nautilus-clipboard.h:
	Wrapped code in ifdef UIH to disable it until it can be converted
	to the new Bonobo.

	* libnautilus-extensions/nautilus-caption-table.h:
	* libnautilus-extensions/nautilus-caption.h:
	* libnautilus-extensions/nautilus-font-picker.h:
	* libnautilus-extensions/nautilus-preferences-group.h:
	* libnautilus-extensions/nautilus-preferences-item.h:
	* libnautilus-extensions/nautilus-radio-button-group.h:
	* src/nautilus-about.h:
	Got rid of any cases where headers include the omnibus header
	<gnome.h>. These made the conversion process harder, which is why
	we fixed them.

	* libnautilus/libnautilus.h:
	Got rid of cases where headers include the omnibus header
	<bonobo.h>.

	* libnautilus/nautilus-view.h:
	* libnautilus/nautilus-view.c: (nautilus_view_set_up_ui):
	Added a helper function to make it easy for Nautilus components to
	load their UI and get it attached to the Nautilus:View object.

	* nautilus.spec.in: Install the nautilus-*-ui.xml files too.

	* src/file-manager/fm-directory-view.h:
	* src/file-manager/fm-directory-view.c:
	(bonobo_menu_select_all_callback),
	(bonobo_menu_empty_trash_callback),
	(bonobo_control_activate_callback): Convert to new API.
	(fm_directory_view_get_bonobo_ui_container): Name and purpose
	changed slightly for new API.
	(fm_directory_view_real_merge_menus): Merge with new API.
	(fm_directory_view_real_update_menus): Disabled this code for now.

	* src/file-manager/fm-icon-view.c: (fm_icon_view_destroy): Destroy
	icon view's own component at destroy time.
	(context_menu_layout_radio_item_callback),
	(append_one_context_menu_layout_item),
	(fm_icon_view_create_background_context_menu_items),
	(update_layout_menus): Convert to new API, disable some with
	#ifdef UIH.
	(get_sort_criterion_by_verb),
	(set_sort_criterion_by_verb), (sort_callback): Convert to new API.
	(fm_icon_view_merge_menus): Merge with new API, creating our own
	UI component separate from the directory view's.
	(fm_icon_view_update_menus): Disable with #ifdef UIH.

	* src/file-manager/fm-search-list-view.h:
	* src/file-manager/fm-search-list-view.c:
	(fm_search_list_view_initialize_class),
	(fm_search_list_view_initialize), (real_destroy),
	(indexing_info_callback), (real_merge_menus), (real_update_menus):
	Add code necessary to use a separate UI component, and disabled
	the actual menu set-up code with #ifdef UIH. This required adding
	a details struct.

	* src/nautilus-desktop-window.c: (realize): Turned off the code
	that hides the desktop elements.

	* src/nautilus-window-private.h:
	* src/nautilus-view-frame.h:
	* src/nautilus-view-frame.c: (nautilus_view_frame_destroy),
	(nautilus_view_frame_new), (nautilus_view_frame_load_client):
	* src/nautilus-window-manage-views.c: (load_content_view),
	(nautilus_window_set_sidebar_panels):
	Change to use Bonobo_UIContainer instead of Bonobo_UIHandler.

	* src/nautilus-window-toolbars.c: (remember_buttons),
	(nautilus_window_initialize_toolbars): Leave this code around and
	change it enough to compile and run, even though it's creating a
	second, invisible toolbar.

	* src/nautilus-window.h: Change to be a BonoboWin subclass instead
	of a GnomeApp subclass.

1 files changed, 113 insertions, 30 deletions

diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 2fc38d792..cc17d26fc 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -39,9 +39,21 @@
 #include "nautilus-throbber.h"
 #include "nautilus-window-manage-views.h"
 #include "nautilus-zoom-control.h"
+#include <bonobo/bonobo-ui-util.h>
 #include <ctype.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gnome.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkoptionmenu.h>
+#ifndef UIH
+#include <gtk/gtkstatusbar.h>
+#endif
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkvbox.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-geometry.h>
+#include <libgnomeui/gnome-messagebox.h>
+#include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-any-width-bin.h>
@@ -106,7 +118,7 @@ static void nautilus_window_show                    (GtkWidget           *widget
 
 NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
 				   nautilus_window,
-				   GNOME_TYPE_APP)
+				   BONOBO_TYPE_WIN)
 
 static void
 nautilus_window_initialize_class (NautilusWindowClass *klass)
@@ -155,7 +167,9 @@ nautilus_window_initialize (NautilusWindow *window)
 static gboolean
 nautilus_window_clear_status (NautilusWindow *window)
 {
+#ifdef UIH
 	gtk_statusbar_pop (GTK_STATUSBAR (GNOME_APP (window)->statusbar), window->status_bar_context_id);
+#endif
 	window->status_bar_clear_id = 0;
 	return FALSE;
 }
@@ -167,10 +181,14 @@ nautilus_window_set_status (NautilusWindow *window, const char *txt)
 		g_source_remove (window->status_bar_clear_id);
 	}
 	
+#ifdef UIH
 	gtk_statusbar_pop (GTK_STATUSBAR (GNOME_APP (window)->statusbar), window->status_bar_context_id);
+#endif
 	if (txt != NULL && txt[0] != '\0') {
 		window->status_bar_clear_id = g_timeout_add(STATUS_BAR_CLEAR_TIMEOUT, (GSourceFunc)nautilus_window_clear_status, window);
+#ifdef UIH
 		gtk_statusbar_push(GTK_STATUSBAR(GNOME_APP(window)->statusbar), window->status_bar_context_id, txt);
+#endif
 	} else {
 		window->status_bar_clear_id = 0;
 	}
@@ -241,13 +259,15 @@ nautilus_window_zoom_to_fit (NautilusWindow *window)
 	}
 }
 
+#ifdef UIH
+
 /* This is our replacement for gnome_app_set_statusbar.
  * It uses nautilus_any_width_bin to make text changes in the
  * status bar not affect the width of the window.
  */
 static void
 install_status_bar (GnomeApp *app,
-		   GtkWidget *status_bar)
+		    GtkWidget *status_bar)
 {
 	GtkWidget *bin;
 
@@ -266,6 +286,8 @@ install_status_bar (GnomeApp *app,
 	gtk_box_pack_start (GTK_BOX (app->vbox), bin, FALSE, FALSE, 0);
 }
 
+#endif
+
 /* Code should never force the window taller than this size.
  * (The user can still stretch the window taller if desired).
  */
@@ -326,13 +348,10 @@ set_initial_window_geometry (NautilusWindow *window)
 static void
 nautilus_window_constructed (NautilusWindow *window)
 {
-	GnomeApp *app;
 	GtkWidget *location_bar_box, *status_bar;
 	GtkWidget *view_as_menu_vbox;
-  	GnomeDockItemBehavior behavior;
   	int sidebar_width;
-
-  	app = GNOME_APP (window);
+	BonoboControl *location_bar_wrapper;
 
 	/* set up location bar */
 	location_bar_box = gtk_hbox_new (FALSE, GNOME_PAD);
@@ -349,15 +368,19 @@ nautilus_window_constructed (NautilusWindow *window)
 
 	gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar,
 			    TRUE, TRUE, GNOME_PAD_SMALL);
+#ifdef UIH
 	behavior = GNOME_DOCK_ITEM_BEH_EXCLUSIVE
 		| GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL;
 	if (!gnome_preferences_get_toolbar_detachable ()) {
 		behavior |= GNOME_DOCK_ITEM_BEH_LOCKED;
 	}
+#endif
 
+#ifdef UIH
 	gnome_app_add_docked (app, location_bar_box,
 			      URI_ENTRY_DOCK_ITEM, behavior,
 			      GNOME_DOCK_TOP, 2, 0, 0);
+#endif
 
 	/* Option menu for content view types; it's empty here, filled in when a uri is set.
 	 * Pack it into vbox so it doesn't grow vertically when location bar does. 
@@ -384,7 +407,9 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	/* set up status bar */
 	status_bar = gtk_statusbar_new ();
+#ifdef UIH
 	install_status_bar (app, status_bar);
+#endif
 
 	/* insert a little padding so text isn't jammed against frame */
 	gtk_misc_set_padding (GTK_MISC (GTK_STATUSBAR (status_bar)->label), GNOME_PAD, 0);
@@ -409,8 +434,8 @@ nautilus_window_constructed (NautilusWindow *window)
 		sidebar_width = nautilus_preferences_get_enum (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, 148);
 		e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
 	}
-	
-	gnome_app_set_contents (app, window->content_hbox);
+	gtk_widget_show (window->content_hbox);
+	bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
 	
 	/* set up the index panel */
 	
@@ -428,9 +453,30 @@ nautilus_window_constructed (NautilusWindow *window)
 	}
 	
 	/* CORBA and Bonobo setup */
-	window->ui_handler = bonobo_ui_handler_new ();
-	bonobo_ui_handler_set_app (window->ui_handler, app);
+	window->details->ui_container = bonobo_ui_container_new ();
+	bonobo_ui_container_set_win (window->details->ui_container,
+				     BONOBO_WIN (window));
+#ifdef UIH
 	bonobo_ui_handler_set_statusbar (window->ui_handler, status_bar);
+#endif
+
+	/* Load the user interface from the XML file. */
+	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
+	bonobo_ui_component_set_container
+		(window->details->shell_ui,
+		 bonobo_object_corba_objref (BONOBO_OBJECT (window->details->ui_container)));
+	bonobo_ui_util_set_ui (window->details->shell_ui,
+			       NAUTILUS_DATADIR,
+			       "nautilus-shell-ui.xml",
+			       "nautilus");
+
+	/* Wrap the location bar in a control and set it up. */
+	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)),
+					NULL);
+	bonobo_object_unref (BONOBO_OBJECT (location_bar_wrapper));
 
 	/* Create menus and tool bars */
 	nautilus_window_initialize_menus (window);
@@ -455,24 +501,25 @@ nautilus_window_set_arg (GtkObject *object,
 			 GtkArg *arg,
 			 guint arg_id)
 {
-	GnomeApp *app = (GnomeApp *) object;
-	char *old_app_name;
+	char *old_name;
 	NautilusWindow *window = (NautilusWindow *) object;
 	
 	switch(arg_id) {
 	case ARG_APP_ID:
-		if(!GTK_VALUE_STRING(*arg))
+		if (GTK_VALUE_STRING (*arg) == NULL) {
 			return;
-		
-		old_app_name = app->name;
-		g_free(app->name);
-		app->name = g_strdup(GTK_VALUE_STRING(*arg));
-		g_assert(app->name);
-		g_free(app->prefix);
-		app->prefix = g_strconcat("/", app->name, "/", NULL);
-		if(!old_app_name) {
-			nautilus_window_constructed(NAUTILUS_WINDOW(object));
 		}
+		old_name = bonobo_win_get_name (BONOBO_WIN (object));
+		bonobo_win_set_name (BONOBO_WIN (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
+		 * it alone.
+		 */
+		if (old_name == NULL) {
+			nautilus_window_constructed (NAUTILUS_WINDOW (object));
+		}
+		g_free (old_name);
 		break;
 	case ARG_APP:
 		window->application = NAUTILUS_APPLICATION (GTK_VALUE_OBJECT (*arg));
@@ -485,11 +532,9 @@ nautilus_window_get_arg (GtkObject *object,
 			 GtkArg *arg,
 			 guint arg_id)
 {
-	GnomeApp *app = (GnomeApp *) object;
-	
 	switch(arg_id) {
 	case ARG_APP_ID:
-		GTK_VALUE_STRING (*arg) = app->name;
+		GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
 		break;
 	case ARG_APP:
 		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
@@ -558,11 +603,13 @@ nautilus_window_destroy (GtkObject *object)
 		g_source_remove (window->status_bar_clear_id);
 	}
 
-	NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
-
-	if (window->ui_handler != NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (window->ui_handler));
+	if (window->details->ui_container != NULL) {
+		bonobo_object_unref (BONOBO_OBJECT (window->details->ui_container));
 	}
+
+	g_free (window->details);
+
+	NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
 }
 
 static void
@@ -1112,32 +1159,40 @@ void
 nautilus_window_allow_back (NautilusWindow *window, gboolean allow)
 {
 	gtk_widget_set_sensitive (window->back_button, allow); 
+#ifdef UIH
 	bonobo_ui_handler_menu_set_sensitivity
 		(window->ui_handler, NAUTILUS_MENU_PATH_BACK_ITEM, allow);
+#endif
 }
 
 void
 nautilus_window_allow_forward (NautilusWindow *window, gboolean allow)
 {
 	gtk_widget_set_sensitive (window->forward_button, allow); 
+#ifdef UIH
 	bonobo_ui_handler_menu_set_sensitivity
 		(window->ui_handler, NAUTILUS_MENU_PATH_FORWARD_ITEM, allow);
+#endif
 }
 
 void
 nautilus_window_allow_up (NautilusWindow *window, gboolean allow)
 {
 	gtk_widget_set_sensitive (window->up_button, allow); 
+#ifdef UIH
 	bonobo_ui_handler_menu_set_sensitivity
 		(window->ui_handler, NAUTILUS_MENU_PATH_UP_ITEM, allow);
+#endif
 }
 
 void
 nautilus_window_allow_reload (NautilusWindow *window, gboolean allow)
 {
 	gtk_widget_set_sensitive (window->reload_button, allow); 
+#ifdef UIH
 	bonobo_ui_handler_menu_set_sensitivity
 		(window->ui_handler, NAUTILUS_MENU_PATH_RELOAD_ITEM, allow);
+#endif
 }
 
 void
@@ -1355,6 +1410,7 @@ nautilus_window_zoom_level_changed_callback (NautilusViewFrame *view,
 
 	}
 
+#ifdef UIH
 	bonobo_ui_handler_menu_set_sensitivity (window->ui_handler,
 						NAUTILUS_MENU_PATH_ZOOM_IN_ITEM,
 						zoom_level < nautilus_view_frame_get_max_zoom_level (view));
@@ -1364,6 +1420,7 @@ nautilus_window_zoom_level_changed_callback (NautilusViewFrame *view,
 	bonobo_ui_handler_menu_set_sensitivity (window->ui_handler,
 						NAUTILUS_MENU_PATH_ZOOM_NORMAL_ITEM,
 						TRUE);
+#endif
 }
 
 static Nautilus_HistoryList *
@@ -1490,9 +1547,11 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 	}
 
 	/* Here's an explicit check for a problem that happens all too often. */
+#ifdef UIH
 	if (bonobo_ui_handler_menu_path_exists (window->ui_handler, "/File/Open")) {
 		g_warning ("There's a lingering Open menu item. This usually means a new Bonobo bug.");
 	}
+#endif
 	
 	if (new_view != NULL) {			
 		gtk_widget_show (GTK_WIDGET (new_view));
@@ -1565,6 +1624,7 @@ sidebar_panels_changed_callback (gpointer user_data)
 static void 
 show_dock_item (NautilusWindow *window, const char *dock_item_name)
 {
+#ifdef UIH
 	GnomeApp *app;
 	GnomeDockItem *dock_item;
 
@@ -1575,12 +1635,14 @@ show_dock_item (NautilusWindow *window, const char *dock_item_name)
 		gtk_widget_show (GTK_WIDGET (dock_item));
 		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
 	}
+#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 static void 
 hide_dock_item (NautilusWindow *window, const char *dock_item_name)
 {
+#ifdef UIH
 	GnomeApp *app;
 	GnomeDockItem *dock_item;
 
@@ -1591,12 +1653,14 @@ hide_dock_item (NautilusWindow *window, const char *dock_item_name)
 		gtk_widget_hide (GTK_WIDGET (dock_item));
 		gtk_widget_queue_resize (GTK_WIDGET (dock_item)->parent);
 	}
+#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 static gboolean
 dock_item_showing (NautilusWindow *window, const char *dock_item_name)
 {
+#ifdef UIH
 	GnomeApp *app;
 	GnomeDockItem *dock_item;
 
@@ -1604,6 +1668,9 @@ dock_item_showing (NautilusWindow *window, const char *dock_item_name)
 
 	dock_item = gnome_app_get_dock_item_by_name (app, dock_item_name);
 	return dock_item != NULL && GTK_WIDGET_VISIBLE (dock_item);
+#else
+	return FALSE;
+#endif
 }
 
 void 
@@ -1627,19 +1694,27 @@ nautilus_window_location_bar_showing (NautilusWindow *window)
 void 
 nautilus_window_hide_tool_bar (NautilusWindow *window)
 {
+#ifdef UIH
 	hide_dock_item (window, GNOME_APP_TOOLBAR_NAME);
+#endif
 }
 
 void 
 nautilus_window_show_tool_bar (NautilusWindow *window)
 {
+#ifdef UIH
 	show_dock_item (window, GNOME_APP_TOOLBAR_NAME);
+#endif
 }
 
 gboolean
 nautilus_window_tool_bar_showing (NautilusWindow *window)
 {
+#ifdef UIH
 	return dock_item_showing (window, GNOME_APP_TOOLBAR_NAME);
+#else
+	return FALSE;
+#endif
 }
 
 void 
@@ -1676,6 +1751,7 @@ nautilus_window_sidebar_showing (NautilusWindow *window)
 void 
 nautilus_window_hide_status_bar (NautilusWindow *window)
 {
+#ifdef UIH
 	GnomeApp *app;
 
 	app = GNOME_APP (window);
@@ -1683,12 +1759,14 @@ nautilus_window_hide_status_bar (NautilusWindow *window)
 	if (app->statusbar != NULL) {
 		gtk_widget_hide (GTK_WIDGET (app->statusbar)->parent);
 	}	
+#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 void 
 nautilus_window_show_status_bar (NautilusWindow *window)
 {
+#ifdef UIH
 	GnomeApp *app;
 
 	app = GNOME_APP (window);
@@ -1696,18 +1774,23 @@ nautilus_window_show_status_bar (NautilusWindow *window)
 	if (app->statusbar != NULL) {
 		gtk_widget_show (GTK_WIDGET (app->statusbar)->parent);
 	}	
+#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 gboolean
 nautilus_window_status_bar_showing (NautilusWindow *window)
 {
+#ifdef UIH
 	GnomeApp *app;
 
 	app = GNOME_APP (window);
 
 	return app->statusbar != NULL
 		&& GTK_WIDGET_VISIBLE (GTK_WIDGET (app->statusbar)->parent);
+#else
+	return FALSE;
+#endif
 }
 
 /**