OAF conversion. You must now build bonobo and gnome-vfs with --enable-oaf

	OAF conversion. You must now build bonobo and gnome-vfs with --enable-oaf

	* configure.in: Check for OAF

	* libnautilus/nautilus-view-component.idl: Inherit from
	Bonobo::Unknown instead of GNOME::Unknown.

	* libnautilus-extensions/nautilus-global-preferences.c,
	libnautilus-extensions/nautilus-global-preferences.h: Refer to
	meta views by OAFIID, not GOAD ID.

	* src/ntl-uri-map.c (my_notify_when_ready): Replaced hardcoded
	list of GOAD IDs with a hardcoded list of OAFIIDs.
	(add_components_from_metadata): Changed the expected format; it is
	now label=component instead of component:label since OAFIIDs
	contain colons.

	* src/ntl-view.c (nautilus_view_destroy_client): unref the
	Zoomable interface of the View, if any.

	* src/file-manager/dfos-corba.c, src/file-manager/dfos.c: replace
	GOAD calls with OAF ones; untested since this code is not really
	used right now.

	* src/ntl-main.c: Use OAF calls to intialize CORBA.

	* src/ntl-app.c: Replace GOAD IDs with OAFIIDs. Use
	Bonobo_Generic_Factory instead of GNOME_Generic_Factory to make
	the linker happy. Register the factory server with OAF, not GOAD.

	* src/nautilus.h: Include <liboaf/liboaf.h> instead of <libgnorba/gnorba.h>


	* components/help/Makefile.am, components/history/Makefile.am,
	components/html/Makefile.am, components/mozilla/Makefile.am,
	components/music/Makefile.am, components/notes/Makefile.am,
	components/rpmview/Makefile.am, components/sample/Makefile.am,
	components/services/startup/Makefile.am,
	components/websearch/Makefile.am, libnautilus/Makefile.am,
	libnautilus-extensions/Makefile.am, src/Makefile.am,
	src/file-manager/Makefile.am: Updated for OAF; install .oafinfo
	files instead of .gnorba.

	* components/help/hyperbola-main.c,
	components/history/ntl-history-view.c,
	components/html/ntl-web-browser.c, components/mozilla/main.c,
	components/music/main.c, components/notes/ntl-notes.c,
	components/rpmview/main.c, components/sample/main.c,
	components/services/startup/main.c,
	components/websearch/ntl-web-search.c: Convert to OAF; use OAFIIDs
	and oaf intialization functions.

	* src/nautilus.oafinfo, components/help/hyperbola.oafinfo,
	components/history/ntl-history-view.oafinfo,
	components/html/ntl-web-browser.oafinfo,
	components/music/nautilus-music-view.oafinfo,
	components/notes/ntl-notes.oafinfo,
	components/rpmview/nautilus-rpm-view.oafinfo,
	components/services/startup/nautilus-service-startup-view.oafinfo,
	components/websearch/ntl-web-search.oafinfo,
	components/sample/nautilus-sample-content-view.oafinfo,
	components/mozilla/nautilus-mozilla-content-view.oafinfo: New OAF
	activation records.

	* src/nautilus.goad, components/help/hyperbola.goad,
	components/history/ntl-history-view.goad,
	components/html/ntl-web-browser.goad,
	components/music/nautilus-music-view.goad,
	components/notes/ntl-notes.goad,
	components/rpmview/nautilus-rpm-view.goad,
	components/services/startup/nautilus-service-startup-view.goad,
	components/websearch/ntl-web-search.goad,
	components/sample/nautilus-sample-content-view.goad,
	components/mozilla/nautilus-mozilla-content-view.goad: Removed.

5 files changed, 52 insertions, 24 deletions

diff --git a/components/rpmview/Makefile.am b/components/rpmview/Makefile.am
index 5f9be5904..f808b955a 100644
--- a/components/rpmview/Makefile.am
+++ b/components/rpmview/Makefile.am
@@ -9,10 +9,10 @@ INCLUDES =					\
 	$(GNOMEUI_CFLAGS)                       \
 	$(WERROR)
 
-gnorbadir = $(sysconfdir)/CORBA/servers
+oafdir = $(datadir)/oaf
 
-gnorba_DATA =					\
-	nautilus-rpm-view.goad
+oaf_DATA =					\
+	nautilus-rpm-view.oafinfo
 
 
 bin_PROGRAMS =					\
@@ -32,6 +32,6 @@ nautilus_rpm_view_LDFLAGS =			\
 	$(GNOMEUI_LIBS)					\
 	-lrpm						\
 	$(VFS_LIBS)					\
-	$(GNORBA_LIBS)
+	$(OAF_LIBS)
 
-EXTRA_DIST = nautilus-rpm-view.goad
+EXTRA_DIST = $(oaf_DATA)
diff --git a/components/rpmview/Nautilus_View_rpm.oaf.in b/components/rpmview/Nautilus_View_rpm.oaf.in
new file mode 100644
index 000000000..e21a0d77c
--- /dev/null
+++ b/components/rpmview/Nautilus_View_rpm.oaf.in
@@ -0,0 +1,19 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf" type="exe" location="nautilus-rpm-view">
+<oaf_attribute name="repo_ids" type="stringv">
+<item value="IDL:GNOME/GenericFactory:1.0"/>
+</oaf_attribute>
+<oaf_attribute name="description" type="string" value="Factory for rpm view"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70" type="factory" location="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf">
+<oaf_attribute name="repo_ids" type="stringv">
+<item value="IDL:GNOME/Control:1.0"/>
+<item value="IDL:Nautilus/ContentView:1.0"/>
+<item value="IDL:Nautilus/View:1.0"/>
+</oaf_attribute>
+<oaf_attribute name="description" type="string" value="rpm view"/>
+</oaf_server>
+
+</oaf_info>
diff --git a/components/rpmview/main.c b/components/rpmview/main.c
index af37bd6ec..94b1910e4 100644
--- a/components/rpmview/main.c
+++ b/components/rpmview/main.c
@@ -28,7 +28,7 @@
 
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libgnorba/gnorba.h>
+#include <liboaf/liboaf.h>
 #include <bonobo.h>
 
 static int object_count = 0;
@@ -50,7 +50,7 @@ rpm_view_make_object (BonoboGenericFactory *factory,
 	NautilusRPMView *rpm_view;
 	NautilusViewFrame *view_frame;
 
-	if (strcmp (goad_id, "nautilus_rpm_view")) {
+	if (strcmp (goad_id, "OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70")) {
 		return NULL;
 	}
 	
@@ -68,12 +68,12 @@ int main(int argc, char *argv[])
 {
 	BonoboGenericFactory *factory;
 	CORBA_ORB orb;
-	CORBA_Environment ev;
 	
-	CORBA_exception_init(&ev);
-	
-	orb = gnome_CORBA_init_with_popt_table ("nautilus-rpm-view", VERSION, &argc, argv, NULL, 0, NULL,
-						GNORBA_INIT_SERVER_FUNC, &ev);
+        gnome_init_with_popt_table("nautilus-rpm-view", VERSION, 
+				   argc, argv,
+				   oaf_popt_options, 0, NULL); 
+
+	orb = oaf_init (argc, argv);
 	
 	bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
 
@@ -81,7 +81,8 @@ int main(int argc, char *argv[])
 	g_thread_init (NULL);
 	gnome_vfs_init ();
 	
-	factory = bonobo_generic_factory_new_multi ("nautilus_rpm_view_factory", rpm_view_make_object, NULL);
+	factory = bonobo_generic_factory_new_multi ("OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf", 
+						    rpm_view_make_object, NULL);
 	
 	do {
 		bonobo_main ();
diff --git a/components/rpmview/nautilus-rpm-view.goad b/components/rpmview/nautilus-rpm-view.goad
deleted file mode 100644
index 9ffda66ff..000000000
--- a/components/rpmview/nautilus-rpm-view.goad
+++ /dev/null
@@ -1,11 +0,0 @@
-[nautilus_rpm_view_factory]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Factory for rpm view
-location_info=nautilus-rpm-view
-
-[nautilus_rpm_view]
-type=factory
-repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
-description=rpm view
-location_info=nautilus_rpm_view_factory
diff --git a/components/rpmview/nautilus-rpm-view.oafinfo b/components/rpmview/nautilus-rpm-view.oafinfo
new file mode 100644
index 000000000..e21a0d77c
--- /dev/null
+++ b/components/rpmview/nautilus-rpm-view.oafinfo
@@ -0,0 +1,19 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf" type="exe" location="nautilus-rpm-view">
+<oaf_attribute name="repo_ids" type="stringv">
+<item value="IDL:GNOME/GenericFactory:1.0"/>
+</oaf_attribute>
+<oaf_attribute name="description" type="string" value="Factory for rpm view"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70" type="factory" location="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf">
+<oaf_attribute name="repo_ids" type="stringv">
+<item value="IDL:GNOME/Control:1.0"/>
+<item value="IDL:Nautilus/ContentView:1.0"/>
+<item value="IDL:Nautilus/View:1.0"/>
+</oaf_attribute>
+<oaf_attribute name="description" type="string" value="rpm view"/>
+</oaf_server>
+
+</oaf_info>