diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/Makefile.am nautilus-2.15.91/src/Makefile.am
--- nautilus-2.15.91.orig/src/Makefile.am	2006-06-17 03:04:09.000000000 +1200
+++ nautilus-2.15.91/src/Makefile.am	2006-08-30 17:42:45.000000000 +1200
@@ -101,8 +101,6 @@
 	nautilus-property-browser.h		\
 	nautilus-query-editor.c			\
 	nautilus-query-editor.h			\
-	nautilus-search-bar.c			\
-	nautilus-search-bar.h			\
 	nautilus-self-check-functions.c 	\
 	nautilus-self-check-functions.h 	\
 	nautilus-shell.c			\
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-navigation-window-menus.c nautilus-2.15.91/src/nautilus-navigation-window-menus.c
--- nautilus-2.15.91.orig/src/nautilus-navigation-window-menus.c	2006-06-17 03:04:09.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-navigation-window-menus.c	2006-08-30 17:37:01.000000000 +1200
@@ -415,11 +415,14 @@
 action_search_callback (GtkAction *action,
 			gpointer user_data)
 {
-	NautilusNavigationWindow *window;
+	NautilusWindow *window;
+	char *uri;
 
-	window = NAUTILUS_NAVIGATION_WINDOW (user_data);
+	window = NAUTILUS_WINDOW (user_data);
 
-	nautilus_navigation_window_show_search (window);
+	uri = nautilus_search_directory_generate_new_uri ();
+	nautilus_window_go_to (window, uri);
+	g_free (uri);
 }
 
 static const GtkActionEntry navigation_entries[] = {
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-navigation-window.c nautilus-2.15.91/src/nautilus-navigation-window.c
--- nautilus-2.15.91.orig/src/nautilus-navigation-window.c	2006-08-30 18:34:36.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-navigation-window.c	2006-08-30 20:02:20.000000000 +1200
@@ -38,7 +38,6 @@
 #include "nautilus-location-bar.h"
 #include "nautilus-pathbar.h"
 #include "nautilus-query-editor.h"
-#include "nautilus-search-bar.h"
 #include "nautilus-window-manage-views.h"
 #include "nautilus-zoom-control.h"
 #include <eel/eel-accessibility.h>
@@ -129,10 +128,6 @@
 
 static void nautilus_navigation_window_set_bar_mode  (NautilusNavigationWindow *window, 
 						      NautilusBarMode           mode);
-static void search_bar_activate_callback             (NautilusSearchBar        *bar,
-						      NautilusWindow           *window);
-static void search_bar_cancel_callback               (GtkWidget                *widget,
-						      NautilusNavigationWindow *window);
 
 static void nautilus_navigation_window_show_location_bar_temporarily (NautilusNavigationWindow *window);
 
@@ -287,15 +282,6 @@
 			    window->navigation_bar,
 			    TRUE, TRUE, 0);
 
-	window->search_bar = nautilus_search_bar_new ();
-	g_signal_connect_object (window->search_bar, "activate",
-				 G_CALLBACK (search_bar_activate_callback), window, 0);
-	g_signal_connect_object (window->search_bar, "cancel",
-				 G_CALLBACK (search_bar_cancel_callback), window, 0);
-	gtk_box_pack_start (GTK_BOX (hbox),
-			    window->search_bar,
-			    TRUE, TRUE, 0);
-
 	/* 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. 
 	 */
@@ -1036,62 +1022,9 @@
 }
 
 static void
-search_bar_activate_callback (NautilusSearchBar *bar,
-			      NautilusWindow *window)
-{
-	char *uri, *home_uri;
-	NautilusDirectory *directory;
-	NautilusSearchDirectory *search_directory;
-	NautilusQuery *query;
-
-	uri = nautilus_search_directory_generate_new_uri ();
-	directory = nautilus_directory_get (uri);
-	
-	g_assert (NAUTILUS_IS_SEARCH_DIRECTORY (directory));
-
-	search_directory = NAUTILUS_SEARCH_DIRECTORY (directory);
-
-	query = nautilus_search_bar_get_query (NAUTILUS_SEARCH_BAR (NAUTILUS_NAVIGATION_WINDOW (window)->search_bar));
-	if (query != NULL) {
-		if (!nautilus_search_directory_is_indexed (search_directory)) {
-			home_uri = nautilus_get_home_directory_uri ();
-			nautilus_query_set_location (query, home_uri);
-			g_free (home_uri);
-		}
-		nautilus_search_directory_set_query (search_directory, query);
-		g_object_unref (query);
-	}
-	
-	nautilus_window_go_to (window, uri);
-	
-	nautilus_directory_unref (directory);
-	g_free (uri);
-}
-
-static void
-search_bar_cancel_callback (GtkWidget *widget,
-			    NautilusNavigationWindow *window)
-{
-	hide_temporary_bars (window);
-}
-
-void 
-nautilus_navigation_window_show_search (NautilusNavigationWindow *window)
-{
-	if (!nautilus_navigation_window_search_bar_showing (window)) {
-		nautilus_navigation_window_show_location_bar_temporarily (window);
-		nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_SEARCH);
-		window->details->temporary_search_bar = TRUE;
-		nautilus_search_bar_clear (NAUTILUS_SEARCH_BAR (window->search_bar));
-	}
-	
-	nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->search_bar));
-}
-
-static void
-query_editor_changed_callback (NautilusSearchBar *bar,
+query_editor_changed_callback (gpointer notused,
 			       NautilusQuery *query,
-			       gboolean reload,
+			       gboolean reload,		       
 			       NautilusWindow *window)
 {
 	NautilusDirectory *directory;
@@ -1132,9 +1065,9 @@
 		nautilus_navigation_window_set_bar_mode (nav_window, NAUTILUS_BAR_SEARCH);
 		nav_window->details->temporary_search_bar = FALSE;
 
-		query_editor = nautilus_query_editor_new_with_bar (FALSE,
-								   nautilus_search_directory_is_indexed (search_directory),
-								   NAUTILUS_SEARCH_BAR (nav_window->search_bar));
+		query_editor = nautilus_query_editor_new (
+			FALSE, 
+			nautilus_search_directory_is_indexed (search_directory));
 	}
 
 	g_signal_connect_object (query_editor, "changed",
@@ -1263,9 +1196,6 @@
 gboolean
 nautilus_navigation_window_search_bar_showing (NautilusNavigationWindow *window)
 {
-	if (window->search_bar != NULL) {
-		return GTK_WIDGET_VISIBLE (window->search_bar);
-	}
 	/* If we're not visible yet we haven't changed visibility, so its TRUE */
 	return TRUE;
 }
@@ -1279,19 +1209,11 @@
 	case NAUTILUS_BAR_PATH:
 		gtk_widget_show (window->path_bar);
 		gtk_widget_hide (window->navigation_bar);
-		gtk_widget_hide (window->search_bar);
 		break;
 
 	case NAUTILUS_BAR_NAVIGATION:
 		gtk_widget_show (window->navigation_bar);
 		gtk_widget_hide (window->path_bar);
-		gtk_widget_hide (window->search_bar);
-		break;
-
-	case NAUTILUS_BAR_SEARCH:
-		gtk_widget_show (window->search_bar);
-		gtk_widget_hide (window->path_bar);
-		gtk_widget_hide (window->navigation_bar);
 		break;
 	}
 }
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-navigation-window.h nautilus-2.15.91/src/nautilus-navigation-window.h
--- nautilus-2.15.91.orig/src/nautilus-navigation-window.h	2006-08-07 22:34:31.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-navigation-window.h	2006-08-30 17:19:31.000000000 +1200
@@ -60,8 +60,7 @@
         GtkWidget *view_as_combo_box;
         GtkWidget *navigation_bar;
 	GtkWidget *path_bar;
-        GtkWidget *search_bar;
-       
+               
         /* Back/Forward chain, and history list. 
          * The data in these lists are NautilusBookmark pointers. 
          */
@@ -119,6 +118,6 @@
 void     nautilus_navigation_window_back_or_forward      (NautilusNavigationWindow *window,
                                                           gboolean                  back,
                                                           guint                     distance);
-void     nautilus_navigation_window_show_search          (NautilusNavigationWindow *window);
+void     nautilus_navigation_window_show_hide_search          (NautilusNavigationWindow *window);
 
 #endif
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-query-editor.c nautilus-2.15.91/src/nautilus-query-editor.c
--- nautilus-2.15.91.orig/src/nautilus-query-editor.c	2006-05-12 02:43:58.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-query-editor.c	2006-08-30 19:44:47.000000000 +1200
@@ -90,8 +90,6 @@
 	GtkTooltips *tooltips;
 
 	GList *rows;
-	
-	NautilusSearchBar *bar;
 };
 
 enum {
@@ -164,20 +162,7 @@
 {
 	NautilusQueryEditor *editor;
 
-	editor = NAUTILUS_QUERY_EDITOR (object);
-	
-
-	if (editor->details->bar != NULL) {
-		g_signal_handlers_disconnect_by_func (editor->details->entry,
-						      entry_activate_cb,
-						      editor);
-		g_signal_handlers_disconnect_by_func (editor->details->entry,
-						      entry_changed_cb,
-						      editor);
-		
-		nautilus_search_bar_return_entry (editor->details->bar);
-		eel_remove_weak_pointer (&editor->details->bar);
-	}
+	editor = NAUTILUS_QUERY_EDITOR (object);	
 
 	if (editor->details->tooltips) {
 		g_object_unref (editor->details->tooltips);
@@ -244,7 +229,7 @@
 	return FALSE;
 }
 
-#define TYPING_TIMEOUT 750
+#define TYPING_TIMEOUT 300
 
 static void
 entry_changed_cb (GtkWidget *entry, NautilusQueryEditor *editor)
@@ -1072,30 +1057,6 @@
 	finish_first_line (editor, hbox, TRUE);
 }
 
-static void
-setup_external_entry (NautilusQueryEditor *editor, GtkWidget *entry)
-{
-	GtkWidget *hbox, *label;
-	
-	/* Create visible part: */
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (editor->details->visible_vbox), hbox, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("Search results"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	
-	editor->details->entry = entry;
-	g_signal_connect (editor->details->entry, "activate",
-			  G_CALLBACK (entry_activate_cb), editor);
-	g_signal_connect (editor->details->entry, "changed",
-			  G_CALLBACK (entry_changed_cb), editor);
-
-	finish_first_line (editor, hbox, FALSE);
-
-}
-
 void
 nautilus_query_editor_set_visible (NautilusQueryEditor *editor,
 				   gboolean visible)
@@ -1203,28 +1164,6 @@
 	return editor;
 }
 
-GtkWidget*
-nautilus_query_editor_new_with_bar (gboolean start_hidden,
-				    gboolean is_indexed,
-				    NautilusSearchBar *bar)
-{
-	GtkWidget *entry;
-	NautilusQueryEditor *editor;
-
-	editor = NAUTILUS_QUERY_EDITOR (g_object_new (NAUTILUS_TYPE_QUERY_EDITOR, NULL));
-	editor->details->is_indexed = is_indexed;
-
-	nautilus_query_editor_set_visible (editor, !start_hidden);
-
-	editor->details->bar = bar;
-	eel_add_weak_pointer (&editor->details->bar);
-	
-	entry = nautilus_search_bar_borrow_entry (bar);
-	setup_external_entry (editor, entry);
-	
-	return GTK_WIDGET (editor);
-}
-
 void
 nautilus_query_editor_set_query (NautilusQueryEditor *editor, NautilusQuery *query)
 {
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-query-editor.h nautilus-2.15.91/src/nautilus-query-editor.h
--- nautilus-2.15.91.orig/src/nautilus-query-editor.h	2005-12-06 06:26:13.000000000 +1300
+++ nautilus-2.15.91/src/nautilus-query-editor.h	2006-08-30 17:43:59.000000000 +1200
@@ -27,7 +27,6 @@
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkentry.h>
 #include <libnautilus-private/nautilus-query.h>
-#include <nautilus-search-bar.h>
 
 #define NAUTILUS_TYPE_QUERY_EDITOR (nautilus_query_editor_get_type ())
 #define NAUTILUS_QUERY_EDITOR(obj) GTK_CHECK_CAST (obj, NAUTILUS_TYPE_QUERY_EDITOR, NautilusQueryEditor)
@@ -53,9 +52,6 @@
 GType      nautilus_query_editor_get_type     	   (void);
 GtkWidget* nautilus_query_editor_new          	   (gboolean start_hidden,
 						    gboolean is_indexed);
-GtkWidget* nautilus_query_editor_new_with_bar      (gboolean start_hidden,
-						    gboolean is_indexed,
-						    NautilusSearchBar *bar);
 void       nautilus_query_editor_set_default_query (NautilusQueryEditor *editor);
 
 void	   nautilus_query_editor_grab_focus (NautilusQueryEditor *editor);
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-search-bar.c nautilus-2.15.91/src/nautilus-search-bar.c
--- nautilus-2.15.91.orig/src/nautilus-search-bar.c	2004-11-23 04:24:37.000000000 +1300
+++ nautilus-2.15.91/src/nautilus-search-bar.c	1970-01-01 12:00:00.000000000 +1200
@@ -1,218 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * Copyright (C) 2005 Novell, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Anders Carlsson <andersca@imendio.com>
- *
- */
-
-#include <config.h>
-#include "nautilus-search-bar.h"
-
-#include <glib/gi18n.h>
-#include <eel/eel-gtk-macros.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-
-struct NautilusSearchBarDetails {
-	GtkWidget *entry;
-	gboolean entry_borrowed;
-};
-
-enum {
-       ACTIVATE,
-       CANCEL,
-       LAST_SIGNAL
-}; 
-
-static guint signals[LAST_SIGNAL];
-
-static void  nautilus_search_bar_class_init       (NautilusSearchBarClass *class);
-static void  nautilus_search_bar_init             (NautilusSearchBar      *bar);
-
-EEL_CLASS_BOILERPLATE (NautilusSearchBar,
-		       nautilus_search_bar,
-		       GTK_TYPE_EVENT_BOX)
-
-	
-static void
-finalize (GObject *object)
-{
-	NautilusSearchBar *bar;
-
-	bar = NAUTILUS_SEARCH_BAR (object);
-
-	g_free (bar->details);
-
-	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
-}
-
-static void
-nautilus_search_bar_class_init (NautilusSearchBarClass *class)
-{
-	GObjectClass *gobject_class;
-	GtkBindingSet *binding_set;
-
-	gobject_class = G_OBJECT_CLASS (class);
-	gobject_class->finalize = finalize;
-
-	signals[ACTIVATE] =
-		g_signal_new ("activate",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (NautilusSearchBarClass, activate),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-	
-	signals[CANCEL] =
-		g_signal_new ("cancel",
-			      G_TYPE_FROM_CLASS (class),
-			      G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
-			      G_STRUCT_OFFSET (NautilusSearchBarClass, cancel),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	binding_set = gtk_binding_set_by_class (class);
-	gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0);
-}
-
-static gboolean
-entry_has_text (NautilusSearchBar *bar)
-{
-       const char *text;
-
-       text = gtk_entry_get_text (GTK_ENTRY (bar->details->entry));
-
-       return text != NULL && text[0] != '\0';
-}
-
-static void
-entry_activate_cb (GtkWidget *entry, NautilusSearchBar *bar)
-{
-       if (entry_has_text (bar) && !bar->details->entry_borrowed) {
-               g_signal_emit (bar, signals[ACTIVATE], 0);
-       }
-}
-
-
-static void
-nautilus_search_bar_init (NautilusSearchBar *bar)
-{
-	GtkWidget *alignment;
-	GtkWidget *hbox;
-	GtkWidget *label;
-
-	bar->details = g_new0 (NautilusSearchBarDetails, 1);
-
-	alignment = gtk_alignment_new (0.5, 0.5,
-				       1.0, 1.0);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
-				   0, 0, 6, 6);
-	gtk_widget_show (alignment);
-	gtk_container_add (GTK_CONTAINER (bar), alignment);
-
-	hbox = gtk_hbox_new (FALSE, 6);
-	gtk_widget_show (hbox);
-	gtk_container_add (GTK_CONTAINER (alignment), hbox);
-
-	label = gtk_label_new ("");
-	gtk_label_set_markup (GTK_LABEL (label), _("<b>Search:</b>"));
-	gtk_widget_show (label);
-
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	bar->details->entry = gtk_entry_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), bar->details->entry, TRUE, TRUE, 0);
-
-	g_signal_connect (bar->details->entry, "activate",
-			  G_CALLBACK (entry_activate_cb), bar);
-
-	gtk_widget_show (bar->details->entry);
-}
-
-GtkWidget *
-nautilus_search_bar_borrow_entry (NautilusSearchBar *bar)
-{
-	GtkBindingSet *binding_set;
-	
-	bar->details->entry_borrowed = TRUE;
-
-	binding_set = gtk_binding_set_by_class (G_OBJECT_GET_CLASS (bar));
-	gtk_binding_entry_clear	(binding_set, GDK_Escape, 0);
-	return bar->details->entry;
-}
-
-void
-nautilus_search_bar_return_entry (NautilusSearchBar *bar)
-{
-	GtkBindingSet *binding_set;
-	
-	bar->details->entry_borrowed = FALSE;
-	
-	binding_set = gtk_binding_set_by_class (G_OBJECT_GET_CLASS (bar));
-	gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0);
-}
-
-GtkWidget *
-nautilus_search_bar_new (void)
-{
-	GtkWidget *bar;
-
-	bar = g_object_new (NAUTILUS_TYPE_SEARCH_BAR, NULL);
-
-	return bar;
-}
-
-NautilusQuery *
-nautilus_search_bar_get_query (NautilusSearchBar *bar)
-{
-	const char *query_text;
-	NautilusQuery *query;
-
-	query_text = gtk_entry_get_text (GTK_ENTRY (bar->details->entry));
-
-	/* Empty string is a NULL query */
-	if (query_text && query_text[0] == '\0') {
-		return NULL;
-	}
-	
-	query = nautilus_query_new ();
-	nautilus_query_set_text (query, query_text);
-
-	return query;
-}
-
-void
-nautilus_search_bar_grab_focus (NautilusSearchBar *bar)
-{
-	gtk_widget_grab_focus (bar->details->entry);
-}
-
-void
-nautilus_search_bar_clear (NautilusSearchBar *bar)
-{
-	gtk_entry_set_text (GTK_ENTRY (bar->details->entry), "");
-}
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-search-bar.h nautilus-2.15.91/src/nautilus-search-bar.h
--- nautilus-2.15.91.orig/src/nautilus-search-bar.h	2004-11-23 04:24:37.000000000 +1300
+++ nautilus-2.15.91/src/nautilus-search-bar.h	1970-01-01 12:00:00.000000000 +1200
@@ -1,61 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * Copyright (C) 2005 Novell, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Anders Carlsson <andersca@imendio.com>
- *
- */
-
-#ifndef NAUTILUS_SEARCH_BAR_H
-#define NAUTILUS_SEARCH_BAR_H
-
-#include <gtk/gtkeventbox.h>
-#include <libnautilus-private/nautilus-query.h>
-
-#define NAUTILUS_TYPE_SEARCH_BAR (nautilus_search_bar_get_type ())
-#define NAUTILUS_SEARCH_BAR(obj) \
-	GTK_CHECK_CAST (obj, NAUTILUS_TYPE_SEARCH_BAR, NautilusSearchBar)
-#define NAUTILUS_SEARCH_BAR_CLASS(klass) \
-	GTK_CHECK_CLASS_CAST (klass, NAUTILUS_TYPE_SEARCH_BAR, NautilusSearchBarClass)
-#define NAUTILUS_IS_SEARCH_BAR(obj) \
-	GTK_CHECK_TYPE (obj, NAUTILUS_TYPE_SEARCH_BAR)
-
-typedef struct NautilusSearchBarDetails NautilusSearchBarDetails;
-
-typedef struct NautilusSearchBar {
-	GtkEventBox parent;
-	NautilusSearchBarDetails *details;
-} NautilusSearchBar;
-
-typedef struct {
-	GtkEventBoxClass parent_class;
-
-	void (* activate) (NautilusSearchBar *bar);
-	void (* cancel)   (NautilusSearchBar *bar);
-} NautilusSearchBarClass;
-
-GType      nautilus_search_bar_get_type     	(void);
-GtkWidget* nautilus_search_bar_new          	(void);
-
-GtkWidget *    nautilus_search_bar_borrow_entry  (NautilusSearchBar *bar);
-void           nautilus_search_bar_return_entry  (NautilusSearchBar *bar);
-void           nautilus_search_bar_grab_focus    (NautilusSearchBar *bar);
-NautilusQuery *nautilus_search_bar_get_query     (NautilusSearchBar *bar);
-void           nautilus_search_bar_clear         (NautilusSearchBar *bar);
-
-#endif /* NAUTILUS_SEARCH_BAR_H */
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-spatial-window.c nautilus-2.15.91/src/nautilus-spatial-window.c
--- nautilus-2.15.91.orig/src/nautilus-spatial-window.c	2006-08-07 22:34:31.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-spatial-window.c	2006-08-30 19:36:17.000000000 +1200
@@ -39,7 +39,6 @@
 #include "nautilus-location-dialog.h"
 #include "nautilus-main.h"
 #include "nautilus-query-editor.h"
-#include "nautilus-search-bar.h"
 #include "nautilus-window-manage-views.h"
 #include "nautilus-zoom-control.h"
 #include <eel/eel-debug.h>
@@ -353,9 +352,9 @@
 }
 
 static void
-query_editor_changed_callback (NautilusSearchBar *bar,
+query_editor_changed_callback (gpointer notused,
 			       NautilusQuery *query,
-			       gboolean reload,
+			       gboolean reload,		       
 			       NautilusWindow *window)
 {
 	NautilusDirectory *directory;
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-window-manage-views.c nautilus-2.15.91/src/nautilus-window-manage-views.c
--- nautilus-2.15.91.orig/src/nautilus-window-manage-views.c	2006-07-22 05:18:59.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-window-manage-views.c	2006-08-30 18:00:58.000000000 +1200
@@ -31,7 +31,6 @@
 #include "nautilus-actions.h"
 #include "nautilus-application.h"
 #include "nautilus-location-bar.h"
-#include "nautilus-search-bar.h"
 #include "nautilus-pathbar.h"
 #include "nautilus-main.h"
 #include "nautilus-window-private.h"
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-window-menus.c nautilus-2.15.91/src/nautilus-window-menus.c
--- nautilus-2.15.91.orig/src/nautilus-window-menus.c	2006-08-07 22:34:31.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-window-menus.c	2006-08-30 18:05:21.000000000 +1200
@@ -38,7 +38,6 @@
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-window-private.h"
 #include "nautilus-desktop-window.h"
-#include "nautilus-search-bar.h"
 #include <eel/eel-debug.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
diff -Nru -x'*.cdtproject' -x.settings -x.project -x'*.in' -x'*.desktop' -x'*.spec' -xautom4te.cache nautilus-2.15.91.orig/src/nautilus-window.c nautilus-2.15.91/src/nautilus-window.c
--- nautilus-2.15.91.orig/src/nautilus-window.c	2006-07-22 05:18:59.000000000 +1200
+++ nautilus-2.15.91/src/nautilus-window.c	2006-08-30 19:59:16.000000000 +1200
@@ -39,7 +39,6 @@
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-zoom-control.h"
-#include "nautilus-search-bar.h"
 #include <eel/eel-debug.h>
 #include <eel/eel-marshal.h>
 #include <eel/eel-gdk-extensions.h>
