added non-x86 files to EXTRA_DISTS change merged from nautilus-1 branchNAUTILUS_1_0_1_1nautilus-1-0-1

2001-04-06  Robin * Slomkowski  <rslomkow@eazel.com>

	* components/music/Makefile.am: added non-x86 files to EXTRA_DISTS
	  change merged from nautilus-1 branch
	* configure.in: upped version to 1.0.1.1

2001-04-06  Robin * Slomkowski  <rslomkow@eazel.com>
	+ robin added Maciej's patch to this branch
2001-04-02  Maciej Stachowiak  <mjs@eazel.com>

	reviewed by: John Harper <jsh@eazel.com>
	             Mike Fleming <mfleming@eazel.com>

	* configure.in:
	* help/nautilus-quick-reference/C/index.html:
	* help/nautilus-release-notes/C/nautilus-release-notes.sgml:
	* help/nautilus-user-manual/C/nautilus-user-manual.sgml:
	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_create_search_pane):
	* src/nautilus-first-time-druid.c: (back_update_page_callback),
	(next_gmc_transition_page_callback),
	(nautilus_first_time_druid_show):
	* src/nautilus-shell-ui.xml:
	* src/nautilus-window-menus.c:
	(nautilus_window_initialize_menus_part_1):

13 files changed, 143 insertions, 722 deletions

diff --git a/ChangeLog b/ChangeLog
index 3cbe3d32f..78363fd86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2001-04-06  Robin * Slomkowski  <rslomkow@eazel.com>
+
+	* components/music/Makefile.am: added non-x86 files to EXTRA_DISTS
+	  change merged from nautilus-1 branch
+	* configure.in: upped version to 1.0.1.1
+
+2001-04-06  Robin * Slomkowski  <rslomkow@eazel.com>
+	+ robin added Maciej's patch to this branch
+2001-04-02  Maciej Stachowiak  <mjs@eazel.com>
+
+	reviewed by: John Harper <jsh@eazel.com>
+	             Mike Fleming <mfleming@eazel.com>
+
+	* configure.in:
+	* help/nautilus-quick-reference/C/index.html:
+	* help/nautilus-release-notes/C/nautilus-release-notes.sgml:
+	* help/nautilus-user-manual/C/nautilus-user-manual.sgml:
+	* libnautilus-extensions/nautilus-global-preferences.c:
+	(global_preferences_create_search_pane):
+	* src/nautilus-first-time-druid.c: (back_update_page_callback),
+	(next_gmc_transition_page_callback),
+	(nautilus_first_time_druid_show):
+	* src/nautilus-shell-ui.xml:
+	* src/nautilus-window-menus.c:
+	(nautilus_window_initialize_menus_part_1):
+
 2001-03-12  Robin * Slomkowski  <rslomkow@eazel.com>
 
 	* components/help/topleveldocs.xml: 
diff --git a/components/music/Makefile.am b/components/music/Makefile.am
index 50f409424..292c5d815 100644
--- a/components/music/Makefile.am
+++ b/components/music/Makefile.am
@@ -8,6 +8,8 @@ decode_source = decode.c
 dct64_source = dct64.c
 endif
 
+platform_source = decode.c dct64.c decode_i386.c dct64_i386.c
+
 INCLUDES =					\
 	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Music\"	\
@@ -78,4 +80,4 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 
 @XML_I18N_MERGE_OAF_RULE@
 
-EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
+EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(platform_source)
diff --git a/configure.in b/configure.in
index 65f23043e..328a650aa 100644
--- a/configure.in
+++ b/configure.in
@@ -105,7 +105,7 @@ if test -n "$GNOME2_PATH"; then
 	export PATH
 fi
 
-AM_INIT_AUTOMAKE(nautilus, 1.0)
+AM_INIT_AUTOMAKE(nautilus, 1.0.1.1)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -826,7 +826,6 @@ case "`medusa-config --libs 2>/dev/null | cut -d ' ' -f1`" in
 	MEDUSA_CFLAGS=""
 	MEDUSA_LIBS=""
 	AC_MSG_RESULT(no)
-	AC_MSG_WARN(Could not find medusa library. Please get it from GNOME's cvs.)
 ;;
  
 *)
diff --git a/help/nautilus-quick-reference/C/index.html b/help/nautilus-quick-reference/C/index.html
index 22c079732..581114e9f 100644
--- a/help/nautilus-quick-reference/C/index.html
+++ b/help/nautilus-quick-reference/C/index.html
@@ -43,8 +43,6 @@ Nautilus Quick Reference
 
 <br><a href="#locbar"><b>Location Bar</b></a>
 
-<br><a href="#find"><b>Fast Find</b></a>
-
 <br><a href="#sidebar"><b>Sidebar</b></a>
 
 <br><a href="#views"><b>Files, Folders, and Views</b></a>
@@ -213,44 +211,6 @@ different symbol instead of the magnifying glass.)</font> </td>
 
 <p>&nbsp;</p>
 
-<a name="find"></a> 
-
-<table bgcolor="black" border="0" cellpadding="1" width="95%">
-<tr>
-<td>
-<table bgcolor="white" border="0" cellpadding="6" cellspacing="0"
-width="100%">
-<tr>
-<td align="center" bgcolor="c1c1d0">
-<h2><font face=
-"Arial, Helvetica, Geneva, Swiss, SunSans-Regular">Fast Find</font></h2>
-</td>
-</tr>
-
-<tr>
-<td align="center"><img src="figures/find.png" alt="The Find Bar"></td>
-</tr>
-
-<tr>
-<td valign="top"><font face=
-"Arial, Helvetica, Geneva, Swiss, SunSans-Regular">Nautilus
-includes Medusa, a search daemon that indexes the content of all
-files and folders on your computer's hard disk. Medusa conducts its
-indexing in the background when your computer is idle.
-<br>
-<br>
-You can do a search with or without Medusa, but searches are faster with Medusa turned on.
-<br>
-<br>
-To turn on Medusa, open the preferences menu, choose Preferences, and click Search. Make sure the button next to "Enable fast search" is turned on.</font> </td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-
-<p>&nbsp;</p>
-
 <a name="sidebar"></a> 
 
 <table bgcolor="black" border="0" cellpadding="1" width="95%">
diff --git a/help/nautilus-release-notes/C/nautilus-release-notes.sgml b/help/nautilus-release-notes/C/nautilus-release-notes.sgml
index a94be6aac..18adf4fcc 100644
--- a/help/nautilus-release-notes/C/nautilus-release-notes.sgml
+++ b/help/nautilus-release-notes/C/nautilus-release-notes.sgml
@@ -129,15 +129,6 @@
 
    <listitem>
     <para>
-     Nautilus includes a fast <guimenuitem>find</guimenuitem> feature
-     that indexes your hard disk so you can quickly search for a file
-     by content as well as file name, creation date, and other file
-     attributes.
-    </para>
-   </listitem>
-
-   <listitem>
-    <para>
      Nautilus has several <guimenuitem>customization</guimenuitem>
      features: You can change backgrounds, personalize icons, and
      switch themes.
@@ -246,35 +237,6 @@
     3. Restart Nautilus.
    </para>
 
-   <para><guimenuitem>Medusa Off by Default</guimenuitem></para>
-
-   <para>The Medusa daemon, which indexes your hard disk so fast
-   searches can be performed, is turned off by default. To turn it on,
-   follow these steps:
-   </para>
-
-   <para>
-    1. Open the preferences menu and choose Preferences.
-   </para>
-
-   <para>
-    2. Click Search in the left-hand column of the Preferences dialog box.
-   </para>
-
-   <para>
-    3. In the Fast Search section, make sure that the button next to
-    Enable fast search is turned on.
-   </para>
-
-   <para>
-    4. Click OK to close the Preferences dialog box.
-   </para>
-
-   <para>Note: For Medusa to perform its indexing task, the crond
-   program must also be running. If you have turned off crond, Medusa
-   won't work.
-   </para>
-
   </sect1>
 
   <sect1 id="session">
@@ -374,7 +336,27 @@
 
    </orderedlist>
 
- </sect1>
+  </sect1>
+
+  <sect1 id="mozilla">
+   <title>Mozilla</title>
+
+   <para>
+    Note that there are some problems using Mozilla 0.8.1 with 
+    this release of Nautilus.  You should use Mozilla 0.8 only 
+    with this release of Nautilus.
+   </para>
+  </sect1>
+
+  <sect1 id="searching">
+   <title>Searching</title>
+
+   <para>
+    The find features used to search the files on your local machine 
+    are not available in Nautilus 1.0.  These features will be
+    available in another release soon. 
+   </para>
+  </sect1>
 
 </article>
 
diff --git a/help/nautilus-user-manual/C/nautilus-user-manual.sgml b/help/nautilus-user-manual/C/nautilus-user-manual.sgml
index 0c080a152..4979788d6 100644
--- a/help/nautilus-user-manual/C/nautilus-user-manual.sgml
+++ b/help/nautilus-user-manual/C/nautilus-user-manual.sgml
@@ -1331,335 +1331,17 @@
 
  <!--  CHAPTER 3: SEARCHING YOUR COMPUTER AND THE INTERNET  -->
  <chapter id="chapter3">
-  <title>Searching Your Computer and the Internet</title>
-
-  <para>
-   Nautilus provides a Find feature for locating files and directories
-   on your computer and a Web Search feature for finding Web pages.
-  </para>
+  <title>Searching the Internet</title>
 
   <sect1 id="toc3">
    <title>Contents of this section:</title>
 
    <simplelist>
-    <member><link linkend="find">Finding Items on Your Computer</link></member>
-    <member><link linkend="simple">Simple Searches</link></member>
-    <member><link linkend="medusa">Complex Searches</link></member>
     <member><link linkend="search">Searching the Internet</link></member>
    </simplelist>
 
   </sect1>
 
-  <!-- Searching Your Computer and the Internet: Finding Items on Your
-  Computer -->
-  <sect1 id="find">
-   <title>Finding Items on Your Computer</title>
-
-   <para>
-    When you search for items on your computer, you can use one
-    of these Nautilus search utilities:
-   </para>
-
-   <itemizedlist>
-
-    <listitem>
-     <para>
-      Simple searches: If your user level is set to Beginner, Nautilus
-      performs a quick and easy search by file name.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Complex searches: If your user level is set to Intermediate or
-      Advanced, Nautilus searches the files on your hard disk by file
-      name, creator, file type, and other attributes, as well as by
-      the actual content of files.
-     </para>
-    </listitem>
-
-   </itemizedlist>
-
-   <para>
-    <guimenu>Fast Versus Slow Searches</guimenu>
-   </para>
-
-   <para>
-    Nautilus uses Medusa, a daemon, which is a piece of software that
-    runs in the background. Medusa creates an index of all the items
-    on your hard disk and mounted volumes, including their names,
-    size, creation date, and other attributes. In addition, Medusa
-    indexes the actual <emphasis>content</emphasis> of each file - so
-    you can find any word or phrase in any file on your computer when
-    you search by content.
-   </para>
-
-   <para>
-    Medusa runs when your computer is idle, so it doesn't disrupt your
-    activities.
-   </para>
-
-   <para>
-    If Medusa has not finished indexing your system or is not running
-    on your computer, when you do a search you may see a message
-    letting you know that Nautilus can't perform a fast search.
-   </para>
-
-   <para>
-    If you suspect that Medusa is not turned on, do this:
-   </para>
-
-   <orderedlist>
-
-    <listitem>
-     <para>
-      Open the preferences menu and choose Preferences.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      From the left column of the Preferences dialog box, choose
-      Search.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      In the Fast Search section, turn on "Enable fast search."
-     </para>
-    </listitem>
-
-   </orderedlist>
-
-   <para>Note: For Medusa to perform its indexing task, the crond
-   program must also be running. If you have turned off crond, Medusa
-   won't work.
-   </para>
-
-  </sect1>
-
-  <!--  Searching Your Computer and the Internet: Simple Searches -->
-  <sect1 id="simple">
-   <title>Simple Searches</title>
-
-   <para>
-    To find an item on your hard disk (Beginner user level):
-   </para>
-
-   <orderedlist>
-
-    <listitem>
-     <para>
-      Click the Find button in the toolbar. The location bar is
-      replaced by the find bar.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Enter the name of the item you want to find in the Find field.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Click Find Them.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      When you're done searching, click the Find button again to put
-      away the Find bar.
-     </para>
-    </listitem>
-
-   </orderedlist>
-
-  </sect1>
-
-  <!--  Searching Your Computer and the Internet: Fast Searches -->
-  <sect1 id="medusa">
-   <title>Complex Searches</title>
-
-   <para>
-    To find an item on your hard disk (Intermediate or Advanced user
-    level):
-   </para>
-
-   <orderedlist>
-
-    <listitem>
-     <para>
-      Click the Find button in the toolbar.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      From the two pop-up menus, choose criteria to define your
-      search. The options are explained below.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      (Optional) To further narrow your search, click More Options and
-      choose additional criteria.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Enter the item you want to find - a particular file name,
-      modification date, and so forth - in the Find field.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Click Find Them.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      When you're done searching, click the Find button again to put
-      away the Find bar.
-     </para>
-    </listitem>
-
-   </orderedlist>
-
-   <informaltable frame="all">
-    <tgroup cols="3">
-     <tbody>
-
-      <row>
-       <entry><guimenu>Search Category</guimenu></entry>
-       <entry><guimenu>Modifier</guimenu></entry>
-       <entry><guimenu>Search Field or List</guimenu></entry>
-      </row>
-
-      <row>
-       <entry>
-        Name: Nautilus searches the names of files on your hard
-        disk.
-       </entry>
-
-       <entry>
-        Specify if the files should have names that contain, begin
-        with, or end with the characters you type. You can also
-        choose "matches glob" or "matches regexp" to do Linux
-        wildcard searches.
-       </entry>
-
-       <entry>
-        Enter part or all of the file name you want to find.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>
-        Content: Nautilus searches the content of files on your hard
-        disk.
-       </entry>
-
-       <entry>
-        Specify if the files should have content that includes
-        all, any, some, or none of the word or phrase you type.
-       </entry>
-
-       <entry>
-        Enter a word or phrase you want to search for in the content of
-        the files on your hard disk.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>
-        Type: Nautilus searches for the file types you specify.
-       </entry>
-
-       <entry>
-        Choose "is" or "is not" to include or exclude file types from
-        the search.
-       </entry>
-
-       <entry>
-        Choose a file type from the pop-up menu.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>Size</entry>
-
-       <entry>
-        Specify if the files should be larger or smaller than
-        the number you type.
-       </entry>
-
-       <entry>Type a size, in kilobytes.</entry>
-
-      </row>
-
-      <row>
-
-       <entry>With Emblem</entry>
-
-       <entry>
-        Specify if the files should be marked with, or not marked
-        with, a particular emblem.
-       </entry>
-
-       <entry>Choose an emblem.</entry>
-
-      </row>
-
-      <row>
-
-       <entry>Last Modified</entry>
-
-       <entry>
-        Choose an option to narrow down the last modification date of
-        the files.
-       </entry>
-
-       <entry>
-        Enter a date. The current date is filled in by default, but
-        you can delete it and type any date you want.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>Owner</entry>
-
-       <entry>
-        Choose "is" or "is not" to include or exclude files owned by a
-        particular user.
-       </entry>
-
-       <entry>
-        Enter the name of a user who owns files on your
-        system.
-       </entry>
-
-      </row>
-
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </sect1>
 
   <!--  Searching Your Computer and the Internet: Searching the Internet  -->
   <sect1 id="search">
diff --git a/help/nautilus-user-manual/C/nautilus-user-manual.xml b/help/nautilus-user-manual/C/nautilus-user-manual.xml
index 0c080a152..4979788d6 100644
--- a/help/nautilus-user-manual/C/nautilus-user-manual.xml
+++ b/help/nautilus-user-manual/C/nautilus-user-manual.xml
@@ -1331,335 +1331,17 @@
 
  <!--  CHAPTER 3: SEARCHING YOUR COMPUTER AND THE INTERNET  -->
  <chapter id="chapter3">
-  <title>Searching Your Computer and the Internet</title>
-
-  <para>
-   Nautilus provides a Find feature for locating files and directories
-   on your computer and a Web Search feature for finding Web pages.
-  </para>
+  <title>Searching the Internet</title>
 
   <sect1 id="toc3">
    <title>Contents of this section:</title>
 
    <simplelist>
-    <member><link linkend="find">Finding Items on Your Computer</link></member>
-    <member><link linkend="simple">Simple Searches</link></member>
-    <member><link linkend="medusa">Complex Searches</link></member>
     <member><link linkend="search">Searching the Internet</link></member>
    </simplelist>
 
   </sect1>
 
-  <!-- Searching Your Computer and the Internet: Finding Items on Your
-  Computer -->
-  <sect1 id="find">
-   <title>Finding Items on Your Computer</title>
-
-   <para>
-    When you search for items on your computer, you can use one
-    of these Nautilus search utilities:
-   </para>
-
-   <itemizedlist>
-
-    <listitem>
-     <para>
-      Simple searches: If your user level is set to Beginner, Nautilus
-      performs a quick and easy search by file name.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Complex searches: If your user level is set to Intermediate or
-      Advanced, Nautilus searches the files on your hard disk by file
-      name, creator, file type, and other attributes, as well as by
-      the actual content of files.
-     </para>
-    </listitem>
-
-   </itemizedlist>
-
-   <para>
-    <guimenu>Fast Versus Slow Searches</guimenu>
-   </para>
-
-   <para>
-    Nautilus uses Medusa, a daemon, which is a piece of software that
-    runs in the background. Medusa creates an index of all the items
-    on your hard disk and mounted volumes, including their names,
-    size, creation date, and other attributes. In addition, Medusa
-    indexes the actual <emphasis>content</emphasis> of each file - so
-    you can find any word or phrase in any file on your computer when
-    you search by content.
-   </para>
-
-   <para>
-    Medusa runs when your computer is idle, so it doesn't disrupt your
-    activities.
-   </para>
-
-   <para>
-    If Medusa has not finished indexing your system or is not running
-    on your computer, when you do a search you may see a message
-    letting you know that Nautilus can't perform a fast search.
-   </para>
-
-   <para>
-    If you suspect that Medusa is not turned on, do this:
-   </para>
-
-   <orderedlist>
-
-    <listitem>
-     <para>
-      Open the preferences menu and choose Preferences.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      From the left column of the Preferences dialog box, choose
-      Search.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      In the Fast Search section, turn on "Enable fast search."
-     </para>
-    </listitem>
-
-   </orderedlist>
-
-   <para>Note: For Medusa to perform its indexing task, the crond
-   program must also be running. If you have turned off crond, Medusa
-   won't work.
-   </para>
-
-  </sect1>
-
-  <!--  Searching Your Computer and the Internet: Simple Searches -->
-  <sect1 id="simple">
-   <title>Simple Searches</title>
-
-   <para>
-    To find an item on your hard disk (Beginner user level):
-   </para>
-
-   <orderedlist>
-
-    <listitem>
-     <para>
-      Click the Find button in the toolbar. The location bar is
-      replaced by the find bar.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Enter the name of the item you want to find in the Find field.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Click Find Them.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      When you're done searching, click the Find button again to put
-      away the Find bar.
-     </para>
-    </listitem>
-
-   </orderedlist>
-
-  </sect1>
-
-  <!--  Searching Your Computer and the Internet: Fast Searches -->
-  <sect1 id="medusa">
-   <title>Complex Searches</title>
-
-   <para>
-    To find an item on your hard disk (Intermediate or Advanced user
-    level):
-   </para>
-
-   <orderedlist>
-
-    <listitem>
-     <para>
-      Click the Find button in the toolbar.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      From the two pop-up menus, choose criteria to define your
-      search. The options are explained below.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      (Optional) To further narrow your search, click More Options and
-      choose additional criteria.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Enter the item you want to find - a particular file name,
-      modification date, and so forth - in the Find field.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Click Find Them.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      When you're done searching, click the Find button again to put
-      away the Find bar.
-     </para>
-    </listitem>
-
-   </orderedlist>
-
-   <informaltable frame="all">
-    <tgroup cols="3">
-     <tbody>
-
-      <row>
-       <entry><guimenu>Search Category</guimenu></entry>
-       <entry><guimenu>Modifier</guimenu></entry>
-       <entry><guimenu>Search Field or List</guimenu></entry>
-      </row>
-
-      <row>
-       <entry>
-        Name: Nautilus searches the names of files on your hard
-        disk.
-       </entry>
-
-       <entry>
-        Specify if the files should have names that contain, begin
-        with, or end with the characters you type. You can also
-        choose "matches glob" or "matches regexp" to do Linux
-        wildcard searches.
-       </entry>
-
-       <entry>
-        Enter part or all of the file name you want to find.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>
-        Content: Nautilus searches the content of files on your hard
-        disk.
-       </entry>
-
-       <entry>
-        Specify if the files should have content that includes
-        all, any, some, or none of the word or phrase you type.
-       </entry>
-
-       <entry>
-        Enter a word or phrase you want to search for in the content of
-        the files on your hard disk.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>
-        Type: Nautilus searches for the file types you specify.
-       </entry>
-
-       <entry>
-        Choose "is" or "is not" to include or exclude file types from
-        the search.
-       </entry>
-
-       <entry>
-        Choose a file type from the pop-up menu.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>Size</entry>
-
-       <entry>
-        Specify if the files should be larger or smaller than
-        the number you type.
-       </entry>
-
-       <entry>Type a size, in kilobytes.</entry>
-
-      </row>
-
-      <row>
-
-       <entry>With Emblem</entry>
-
-       <entry>
-        Specify if the files should be marked with, or not marked
-        with, a particular emblem.
-       </entry>
-
-       <entry>Choose an emblem.</entry>
-
-      </row>
-
-      <row>
-
-       <entry>Last Modified</entry>
-
-       <entry>
-        Choose an option to narrow down the last modification date of
-        the files.
-       </entry>
-
-       <entry>
-        Enter a date. The current date is filled in by default, but
-        you can delete it and type any date you want.
-       </entry>
-
-      </row>
-
-      <row>
-
-       <entry>Owner</entry>
-
-       <entry>
-        Choose "is" or "is not" to include or exclude files owned by a
-        particular user.
-       </entry>
-
-       <entry>
-        Enter the name of a user who owns files on your
-        system.
-       </entry>
-
-      </row>
-
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </sect1>
 
   <!--  Searching Your Computer and the Internet: Searching the Internet  -->
   <sect1 id="search">
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index 88763d1a2..9a128d71e 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -787,11 +787,13 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 	
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_BOX (preference_box), NULL);
 
+
  	/*
  	 * Search Settings 
  	 */
 	search_pane = nautilus_preferences_box_add_pane (preference_box,
 							 _("Search"));
+#ifdef HAVE_MEDUSA
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Complexity Options"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
@@ -804,13 +806,19 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 							 1,
 							 NAUTILUS_PREFERENCES_USE_FAST_SEARCH,
 							 NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
+#endif
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Engines"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
+#ifdef HAVE_MEDUSA
 							 2,
+#else
+							 0,
+#endif
 							 NAUTILUS_PREFERENCES_SEARCH_WEB_URI,
 							 NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING);
 
+#ifdef HAVE_MEDUSA
 	/* Setup callbacks so that we can update the sensitivity of
 	 * the search pane when the medusa blocked state changes
 	 */
@@ -819,7 +827,7 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 						       fast_search_group,
 						       GTK_OBJECT (fast_search_group));
 	global_preferences_medusa_blocked_changed_callback (fast_search_group);
-
+#endif
 	return search_pane;
 }
 
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 88763d1a2..9a128d71e 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -787,11 +787,13 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 	
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_BOX (preference_box), NULL);
 
+
  	/*
  	 * Search Settings 
  	 */
 	search_pane = nautilus_preferences_box_add_pane (preference_box,
 							 _("Search"));
+#ifdef HAVE_MEDUSA
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Complexity Options"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
@@ -804,13 +806,19 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 							 1,
 							 NAUTILUS_PREFERENCES_USE_FAST_SEARCH,
 							 NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
+#endif
 	nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (search_pane),
 					     _("Search Engines"));
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (search_pane),
+#ifdef HAVE_MEDUSA
 							 2,
+#else
+							 0,
+#endif
 							 NAUTILUS_PREFERENCES_SEARCH_WEB_URI,
 							 NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING);
 
+#ifdef HAVE_MEDUSA
 	/* Setup callbacks so that we can update the sensitivity of
 	 * the search pane when the medusa blocked state changes
 	 */
@@ -819,7 +827,7 @@ global_preferences_create_search_pane (NautilusPreferencesBox *preference_box)
 						       fast_search_group,
 						       GTK_OBJECT (fast_search_group));
 	global_preferences_medusa_blocked_changed_callback (fast_search_group);
-
+#endif
 	return search_pane;
 }
 
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index 70e6ef5d3..472814b6b 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -763,6 +763,7 @@ next_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 static gboolean
 back_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 {
+#ifdef HAVE_MEDUSA
 	/* If we didn't want medusa, or cron is active, don't go "back" to the cron page */
 	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (enable_medusa_checkbox_widget)) ||
 	    cron_status == NAUTILUS_CRON_STATUS_ON) {
@@ -771,6 +772,9 @@ back_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 	else {
 		gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[START_CRON_INFORMATION_PAGE]));
 	}
+#else
+	gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[GMC_TRANSITION_PAGE]));
+#endif
 
 	return TRUE;
 }
@@ -991,6 +995,19 @@ set_up_medusa_page (NautilusDruidPageEazel *page)
 
 /* handle the "next" signal for the medusa page, if cron is enabled. */
 static gboolean
+next_gmc_transition_page_callback (GtkWidget *button, GnomeDruid *druid)
+{
+#ifdef HAVE_MEDUSA
+	gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[LAUNCH_MEDUSA_PAGE]));
+#else
+	gnome_druid_set_page (druid, GNOME_DRUID_PAGE (pages[OFFER_UPDATE_PAGE]));
+#endif
+	return TRUE;
+}
+
+
+/* handle the "next" signal for the medusa page, if cron is enabled. */
+static gboolean
 next_medusa_page_callback (GtkWidget *button, GnomeDruid *druid)
 {
 	/* If we didn't want medusa, or cron is active, continue as normal */
@@ -1213,6 +1230,9 @@ nautilus_first_time_druid_show (NautilusApplication *application, gboolean manag
 	/* set up the GMC transition page */
 	set_page_title (NAUTILUS_DRUID_PAGE_EAZEL (pages[GMC_TRANSITION_PAGE]), _("GMC to Nautilus Transition"));
 	set_up_gmc_transition_page (NAUTILUS_DRUID_PAGE_EAZEL (pages[GMC_TRANSITION_PAGE]));
+	gtk_signal_connect (GTK_OBJECT (pages[GMC_TRANSITION_PAGE]), "next",
+			    GTK_SIGNAL_FUNC (next_gmc_transition_page_callback),
+			    druid);
 
 	/* set up the `Launch Medusa' page */
 	set_page_title (NAUTILUS_DRUID_PAGE_EAZEL (pages[LAUNCH_MEDUSA_PAGE]), _("Fast Searches"));
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index f84f52c81..5535e200e 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -73,6 +73,10 @@
  */
 
 #define MENU_PATH_TOGGLE_FIND_MODE			"/menu/File/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE                   "/commands/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE        "/commands/Toggle Find Mode With State"
+
+#define TOOLBAR_PATH_TOGGLE_FIND_MODE			"/Toolbar/Toggle Find Mode"
 
 #define MENU_PATH_SHOW_HIDE_SIDEBAR			"/menu/View/Show Hide Placeholder/Show Hide Sidebar"
 #define MENU_PATH_SHOW_HIDE_TOOLBAR			"/menu/View/Show Hide Placeholder/Show Hide Toolbar"
@@ -1201,6 +1205,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("New Window", file_menu_new_window_callback),
 		BONOBO_UI_VERB ("Close", file_menu_close_window_callback),
 		BONOBO_UI_VERB ("Close All Windows", file_menu_close_all_windows_callback),
+#ifdef HAVE_MEDUSA
 		BONOBO_UI_VERB ("Toggle Find Mode", file_menu_toggle_find_mode_callback),
 		/* FIXME: bugzilla.eazel.com 3590:
 		 * Note that we use a different verb for the toolbar button since
@@ -1208,6 +1213,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		 * otherwise confuse Bonobo.
 		 */
 		BONOBO_UI_VERB ("Toggle Find Mode With State", file_menu_toggle_find_mode_callback),
+#endif
 		BONOBO_UI_VERB ("Go to Web Search", file_menu_web_search_callback),
 		BONOBO_UI_VERB ("Undo", edit_menu_undo_callback),
 		BONOBO_UI_VERB ("Customize", customize_callback),
@@ -1284,6 +1290,25 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 	nautilus_bonobo_set_hidden (window->details->shell_ui, NAUTILUS_MENU_PATH_PROFILER, TRUE);
 #endif
 
+#ifndef HAVE_MEDUSA
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE,
+				    TRUE);
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				    TRUE);
+	/* Also set these items insensitive so that keyboard shortcuts do not trigger
+	   warnings */
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE,
+				       FALSE);
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				       FALSE);
+
+#endif
+
+
 	nautilus_window_ui_thaw (window);
 }
 
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 27e36529f..9a6b8e2cb 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -17,6 +17,8 @@
 	 _tip="Open another Nautilus window for the displayed location"/>
 	<cmd name="Stop"
 	 _tip="Stop loading this location"/>
+        <cmd name="Toggle Find Mode"/>
+        <cmd name="Toggle Find Mode With State"/>
 	<cmd name="Services"
 	 _tip="Go to Eazel Services"/>
 	<cmd name="Select All" accel="*Control*a" sensitive="0"/>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index f84f52c81..5535e200e 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -73,6 +73,10 @@
  */
 
 #define MENU_PATH_TOGGLE_FIND_MODE			"/menu/File/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE                   "/commands/Toggle Find Mode"
+#define COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE        "/commands/Toggle Find Mode With State"
+
+#define TOOLBAR_PATH_TOGGLE_FIND_MODE			"/Toolbar/Toggle Find Mode"
 
 #define MENU_PATH_SHOW_HIDE_SIDEBAR			"/menu/View/Show Hide Placeholder/Show Hide Sidebar"
 #define MENU_PATH_SHOW_HIDE_TOOLBAR			"/menu/View/Show Hide Placeholder/Show Hide Toolbar"
@@ -1201,6 +1205,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("New Window", file_menu_new_window_callback),
 		BONOBO_UI_VERB ("Close", file_menu_close_window_callback),
 		BONOBO_UI_VERB ("Close All Windows", file_menu_close_all_windows_callback),
+#ifdef HAVE_MEDUSA
 		BONOBO_UI_VERB ("Toggle Find Mode", file_menu_toggle_find_mode_callback),
 		/* FIXME: bugzilla.eazel.com 3590:
 		 * Note that we use a different verb for the toolbar button since
@@ -1208,6 +1213,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		 * otherwise confuse Bonobo.
 		 */
 		BONOBO_UI_VERB ("Toggle Find Mode With State", file_menu_toggle_find_mode_callback),
+#endif
 		BONOBO_UI_VERB ("Go to Web Search", file_menu_web_search_callback),
 		BONOBO_UI_VERB ("Undo", edit_menu_undo_callback),
 		BONOBO_UI_VERB ("Customize", customize_callback),
@@ -1284,6 +1290,25 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 	nautilus_bonobo_set_hidden (window->details->shell_ui, NAUTILUS_MENU_PATH_PROFILER, TRUE);
 #endif
 
+#ifndef HAVE_MEDUSA
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE,
+				    TRUE);
+	nautilus_bonobo_set_hidden (window->details->shell_ui,
+				    COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				    TRUE);
+	/* Also set these items insensitive so that keyboard shortcuts do not trigger
+	   warnings */
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE,
+				       FALSE);
+	nautilus_bonobo_set_sensitive (window->details->shell_ui,
+				       COMMAND_PATH_TOGGLE_FIND_MODE_WITH_STATE,
+				       FALSE);
+
+#endif
+
+
 	nautilus_window_ui_thaw (window);
 }