Removed the obsolete Nautilus/ContentView and Nautilus/MetaView.

	* components/hardware/nautilus-hardware-view.oafinfo:
	* components/help/help-contents.oafinfo:
	* components/help/help-index.oafinfo:
	* components/help/help-search.oafinfo:
	* components/history/nautilus-history-view.oafinfo:
	* components/html/ntl-web-browser.oafinfo:
	* components/loser/content/nautilus-content-loser.oafinfo:
	* components/loser/sidebar/nautilus-sidebar-loser.oafinfo:
	* components/mozilla/nautilus-mozilla-content-view.oafinfo:
	* components/music/nautilus-music-view.oafinfo:
	* components/notes/nautilus-notes.oafinfo:
	* components/rpmview/nautilus-rpm-view.oafinfo:
	* components/sample/nautilus-sample-content-view.oafinfo:
	* components/services/inventory/nautilus-view/nautilus-inventory-view.oafinfo:
	* components/services/login/nautilus-view/nautilus-login-view.oafinfo:
	* components/services/startup/nautilus-view/nautilus-service-startup-view.oafinfo:
	* components/services/summary/nautilus-view/nautilus-summary-view.oafinfo:
	* components/services/time/nautilus-view/trilobite-eazel-time-view.oafinfo:
	* components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo:
	* components/shell/shell.oafinfo:
	* components/tree/nautilus-tree-view.oafinfo:
	* components/websearch/ntl-web-search.oafinfo:
	Removed the obsolete Nautilus/ContentView and Nautilus/MetaView.

	* components/services/install/command-line/.cvsignore:
	Added a generated file.

	* libnautilus-extensions/nautilus-directory-async.c:
	(metafile_read_done), (allow_metafile),
	(nautilus_directory_request_read_metafile): Another quick cut at
	leaving out metafiles for some schemes.
	(dequeue_pending_idle_callback): Get rid of "pending file info is
	NULL!" message and "approve" the change that made Maciej put it
	in.

	* libnautilus/nautilus-view.c: (nautilus_uri_list_from_g_list):
	Use CORBA_TRUE to truly use CORBA correctly.

	* src/nautilus-shell-interface.idl:
	* src/.cvsignore:
	* src/Makefile.am:
	* src/nautilus.oafinfo:
	* src/nautilus-shell.h:
	* src/nautilus-shell.c: (nautilus_shell_initialize_class),
	(nautilus_shell_get_epv), (nautilus_shell_get_vepv),
	(nautilus_shell_create_servant), (nautilus_shell_initialize),
	(destroy), (nautilus_shell_new), (display_caveat),
	(display_caveat_first_time), (open_window), (corba_open_windows),
	(corba_open_default_window), (corba_manage_desktop): Added a new
	CORBA file for the interface of the Nautilus shell itself and a
	class for a server side of it. Moved some code in here from
	NautilusApplication.

	* src/nautilus-application.c: (manufactures), (create_object),
	(create_factory), (nautilus_application_initialize),
	(nautilus_strv_length), (nautilus_make_uri_list_from_strv),
	(nautilus_application_startup): Moved the IID strings into
	constants for easier code reading. Added the code that can yield
	up the shell object, although it's not used yet. Changed startup
	code to use the NautilusShell object to do the work. This doesn't
	work cross-process yet, but it's ready to.

	* src/nautilus-window.h:
	* src/nautilus-window.c: (nautilus_window_initialize_class),
	(nautilus_window_initialize), (goto_uri_callback),
	(navigation_bar_mode_changed_callback),
	(nautilus_window_constructed), (nautilus_window_destroy),
	(nautilus_window_realize): Misc. cleanup, including getting rid of
	the strange old way of doing parent_class.

1 files changed, 46 insertions, 41 deletions

diff --git a/src/Nautilus_shell.server.in b/src/Nautilus_shell.server.in
index 31017fa5e..971f15747 100644
--- a/src/Nautilus_shell.server.in
+++ b/src/Nautilus_shell.server.in
@@ -1,50 +1,55 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:GNOME/GenericFactory:1.0"/>
-<item value="IDL:Nautilus/Application:1.0"/>
-<item value="IDL:Bonobo/Unknown:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Nautilus application"/>
-<oaf_attribute name="description" type="string" value="File manager component's factory"/>
+<oaf_server iid="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus">
+  <oaf_attribute name="repo_ids" type="stringv">
+    <item value="IDL:GNOME/GenericFactory:1.0"/>
+  </oaf_attribute>
+  <oaf_attribute name="name" type="string" value="Nautilus factory"/>
+  <oaf_attribute name="description" type="string" value="Factory for Nautilus shell and file manager"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:nautilus_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:Bonobo/Control:1.0"/>
-<item value="IDL:Bonobo/Unknown:1.0"/>
-<item value="IDL:Nautilus/ContentView:1.0"/>
-<item value="IDL:Nautilus/View:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="File manager icon view"/>
-<oaf_attribute name="description" type="string" value="File manager component that shows a two-dimensional icon space"/>
-<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-<item value="x-special/directory"/>
-<item value="x-special/webdav-directory"/>
-</oaf_attribute>
-<oaf_attribute name="nautilus:view_as_name" type="string" value="Icons"/>
+<oaf_server iid="OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+  <oaf_attribute name="repo_ids" type="stringv">
+    <item value="IDL:Bonobo/Unknown:1.0"/>
+    <item value="IDL:Bonobo/Control:1.0"/>
+    <item value="IDL:Nautilus/View:1.0"/>
+  </oaf_attribute>
+  <oaf_attribute name="name" type="string" value="Nautilus file manager icon view"/>
+  <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a two-dimensional icon space"/>
+  <oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+    <item value="x-special/directory"/>
+    <item value="x-special/webdav-directory"/>
+  </oaf_attribute>
+  <oaf_attribute name="nautilus:view_as_name" type="string" value="Icons"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:nautilus_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:Bonobo/Control:1.0"/>
-<item value="IDL:Bonobo/Unknown:1.0"/>
-<item value="IDL:Nautilus/ContentView:1.0"/>
-<item value="IDL:Nautilus/View:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="File manager list view"/>
-<oaf_attribute name="description" type="string" value="File manager component that shows a scrollable list"/>
-<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-<item value="x-special/directory"/>
-<item value="x-special/webdav-directory"/>
-</oaf_attribute>
-<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
-<item value="search"/>
-<item value="gnome-search"/>
-<item value="medusa"/>
-</oaf_attribute>
-<oaf_attribute name="nautilus:view_as_name" type="string" value="List"/>
+<oaf_server iid="OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+  <oaf_attribute name="repo_ids" type="stringv">
+    <item value="IDL:Bonobo/Unknown:1.0"/>
+    <item value="IDL:Bonobo/Control:1.0"/>
+    <item value="IDL:Nautilus/View:1.0"/>
+  </oaf_attribute>
+  <oaf_attribute name="name" type="string" value="Nautilus file manager list view"/>
+  <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list"/>
+  <oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+    <item value="x-special/directory"/>
+    <item value="x-special/webdav-directory"/>
+  </oaf_attribute>
+    <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
+      <item value="search"/>
+      <item value="gnome-search"/>
+      <item value="medusa"/>
+    </oaf_attribute>
+  <oaf_attribute name="nautilus:view_as_name" type="string" value="List"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:nautilus_shell:cd5183b2-3913-4b74-9b8e-10528b0de08d" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
+  <oaf_attribute name="repo_ids" type="stringv">
+    <item value="IDL:Bonobo/Unknown:1.0"/>
+    <item value="IDL:Nautilus/Shell:1.0"/>
+  </oaf_attribute>
+  <oaf_attribute name="name" type="string" value="Nautilus shell"/>
+  <oaf_attribute name="description" type="string" value="Nautilus shell operations that can be done from subsequent command-line invocations"/>
 </oaf_server>
 
 </oaf_info>