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.

7 files changed, 12 insertions, 13 deletions

diff --git a/test/test-nautilus-async-activation.c b/test/test-nautilus-async-activation.c
index b3f272923..bb0191820 100644
--- a/test/test-nautilus-async-activation.c
+++ b/test/test-nautilus-async-activation.c
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
 	NautilusBonoboActivationHandle *handle;
 
 	gtk_init (&argc, &argv);
-	oaf_init (argc, argv);
+	bonobo_activation_init (argc, argv);
 	bonobo_init (bonobo_orb (), 
 		     bonobo_poa (), 
 		     bonobo_poa_manager ());
diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index 4adc55938..1fa4d7931 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -110,8 +110,8 @@ main (int argc, char **argv)
 	NautilusFile *file;
 	GList *attributes;
 
-	gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
-	oaf_init (argc, argv);
+	gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
+	bonobo_activation_init (argc, argv);
 
 	g_thread_init (NULL);
 	gnome_vfs_init ();
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index b4f53b726..962295ab8 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -77,7 +77,7 @@ print_application (GnomeVFSMimeApplication *application)
 }
 
 static void
-print_component (OAF_ServerInfo *component)
+print_component (Bonobo_ServerInfo *component)
 {
         if (component == NULL) {
 	        puts ("(none)");
@@ -145,7 +145,7 @@ main (int argc, char **argv)
 {
         const char *uri;  
 	GnomeVFSMimeApplication *default_application;
-	OAF_ServerInfo *default_component;
+	Bonobo_ServerInfo *default_component;
 	GnomeVFSMimeAction *default_action;
 	GList *all_components;
 	GList *all_applications;
@@ -157,8 +157,8 @@ main (int argc, char **argv)
 	g_thread_init (NULL);
 	gnome_vfs_init ();
 
-	gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
-	oaf_init (argc, argv);
+	gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
+	bonobo_activation_init (argc, argv);
 	gnome_init("test-nautilus-mime-actions", "0.0",
 		       argc, argv);
 
diff --git a/test/test-nautilus-preferences-change.c b/test/test-nautilus-preferences-change.c
index 5c0bd85de..41749b8ed 100644
--- a/test/test-nautilus-preferences-change.c
+++ b/test/test-nautilus-preferences-change.c
@@ -152,7 +152,7 @@ main (int argc, char *argv[])
 
 	test_init (&argc, &argv);
 
-	nautilus_global_preferences_initialize ();
+	nautilus_global_preferences_init ();
 
 	user_level_entries = eel_string_list_new_from_tokens ("Beginner,Intermediate,Advanced", ",", TRUE);
 	color_entries = eel_string_list_new_from_tokens ("0,1,2,3,4,5,6,7,8,9,10", ",", TRUE);
diff --git a/test/test-nautilus-preferences-display.c b/test/test-nautilus-preferences-display.c
index 3cbe33242..bd3442186 100644
--- a/test/test-nautilus-preferences-display.c
+++ b/test/test-nautilus-preferences-display.c
@@ -243,7 +243,7 @@ main (int argc, char *argv[])
 
 	test_init (&argc, &argv);
 
-	nautilus_global_preferences_initialize ();
+	nautilus_global_preferences_init ();
 
 	window = test_window_new (NULL, 4);
 	test_window_set_title_with_pid (GTK_WINDOW (window), "Preferences Display");
diff --git a/test/test-nautilus-smooth-graphics.c b/test/test-nautilus-smooth-graphics.c
index 9bb622531..346ccf81c 100644
--- a/test/test-nautilus-smooth-graphics.c
+++ b/test/test-nautilus-smooth-graphics.c
@@ -1,8 +1,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-init.h>
+#include <libgnome/gnome-init.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 
 static void
@@ -38,7 +37,7 @@ main (int argc, char * argv[])
 	
 	gnome_init ("foo", "bar", argc, argv);
 
-	nautilus_global_preferences_initialize ();
+	nautilus_global_preferences_init ();
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
diff --git a/test/test.c b/test/test.c
index bca28f8dc..68949a066 100644
--- a/test/test.c
+++ b/test/test.c
@@ -117,7 +117,7 @@ test_pixbuf_new_named (const char *name, float scale)
 		path = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, name);
 	}
 
-	pixbuf = gdk_pixbuf_new_from_file (path);
+	pixbuf = gdk_pixbuf_new_from_file (path, NULL);
 
 	g_free (path);