More GNOME 2 work. We now compile up to libnautilus-private and I'm

	* Lots of files:
	More GNOME 2 work. We now compile up to libnautilus-private and
	I'm working my way through the files in there. Also changed all
	the initialize_class and initialize to class_init and init.

1 files changed, 11 insertions, 12 deletions

diff --git a/libnautilus-private/nautilus-view-identifier.c b/libnautilus-private/nautilus-view-identifier.c
index 69526c3c5..a35833be9 100644
--- a/libnautilus-private/nautilus-view-identifier.c
+++ b/libnautilus-private/nautilus-view-identifier.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #include "nautilus-view-identifier.h"
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 
 
@@ -133,7 +132,7 @@ get_lang_list (void)
 }
 
 NautilusViewIdentifier *
-nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char *name_attribute)
+nautilus_view_identifier_new_from_bonobo_activation_server_info (Bonobo_ServerInfo *server, char *name_attribute)
 {
         const char *view_as_name;       
         const char *view_as_label;       
@@ -142,12 +141,12 @@ nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char
 
         langs = get_lang_list ();
 
-        view_as_name = oaf_server_info_prop_lookup (server, name_attribute, langs);
-	view_as_label = oaf_server_info_prop_lookup (server, "nautilus:view_as_label", langs);
-	viewer_label = oaf_server_info_prop_lookup (server, "nautilus:viewer_label", langs);
+        view_as_name = bonobo_activation_server_info_prop_lookup (server, name_attribute, langs);
+	view_as_label = bonobo_activation_server_info_prop_lookup (server, "nautilus:view_as_label", langs);
+	viewer_label = bonobo_activation_server_info_prop_lookup (server, "nautilus:viewer_label", langs);
 
         if (view_as_name == NULL) {
-                view_as_name = oaf_server_info_prop_lookup (server, "name", langs);
+                view_as_name = bonobo_activation_server_info_prop_lookup (server, "name", langs);
         }
         if (view_as_name == NULL) {
                 view_as_name = server->iid;
@@ -177,23 +176,23 @@ nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char
 }
 
 NautilusViewIdentifier *
-nautilus_view_identifier_new_from_content_view (OAF_ServerInfo *server)
+nautilus_view_identifier_new_from_content_view (Bonobo_ServerInfo *server)
 {
-	return nautilus_view_identifier_new_from_oaf_server_info
+	return nautilus_view_identifier_new_from_bonobo_activation_server_info
 		(server, "nautilus:view_as_name");
 }
 
 NautilusViewIdentifier *
-nautilus_view_identifier_new_from_property_page (OAF_ServerInfo *server)
+nautilus_view_identifier_new_from_property_page (Bonobo_ServerInfo *server)
 {
-	return nautilus_view_identifier_new_from_oaf_server_info
+	return nautilus_view_identifier_new_from_bonobo_activation_server_info
 		(server, "nautilus:property_page_name");
 }
 
 NautilusViewIdentifier *
-nautilus_view_identifier_new_from_sidebar_panel (OAF_ServerInfo *server)
+nautilus_view_identifier_new_from_sidebar_panel (Bonobo_ServerInfo *server)
 {
-	return nautilus_view_identifier_new_from_oaf_server_info
+	return nautilus_view_identifier_new_from_bonobo_activation_server_info
 		(server, "nautilus:sidebar_panel_name");
 }