diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
| commit | 5abcc1995419a91bebe2e42a5218a374e36533c3 (patch) | |
| tree | 2f6c9699dc992039a973b0bd058aebfa2d820669 /components/throbber | |
| parent | b36a91ca55636af4137615a88c6e70a6dffe7802 (diff) | |
| download | nautilus-5abcc1995419a91bebe2e42a5218a374e36533c3.tar.gz | |
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.
Diffstat (limited to 'components/throbber')
| -rw-r--r-- | components/throbber/main.c | 8 | ||||
| -rw-r--r-- | components/throbber/nautilus-throbber.c | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/components/throbber/main.c b/components/throbber/main.c index 723243c49..454a39d12 100644 --- a/components/throbber/main.c +++ b/components/throbber/main.c @@ -80,8 +80,8 @@ main (int argc, char *argv[]) /* Disable session manager connection */ gnome_client_disable_master_connection (); - gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ()); - orb = oaf_init (argc, argv); + gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ()); + orb = bonobo_activation_init (argc, argv); gnome_init ("nautilus-throbber", VERSION, argc, argv); g_thread_init (NULL); @@ -89,9 +89,9 @@ main (int argc, char *argv[]) gnome_vfs_init (); bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - nautilus_global_preferences_initialize (); + nautilus_global_preferences_init (); - registration_id = oaf_make_registration_id ("OAFIID:nautilus_throbber_factory", g_getenv ("DISPLAY")); + registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_throbber_factory", g_getenv ("DISPLAY")); factory = bonobo_generic_factory_new_multi (registration_id, throbber_make_object, NULL); diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c index 71ef7a810..516c60e50 100644 --- a/components/throbber/nautilus-throbber.c +++ b/components/throbber/nautilus-throbber.c @@ -32,7 +32,6 @@ #include <gtk/gtkmenu.h> #include <gtk/gtkmenuitem.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-pixmap.h> #include <libnautilus-private/nautilus-file-utilities.h> @@ -68,8 +67,8 @@ struct NautilusThrobberDetails { }; -static void nautilus_throbber_initialize_class (NautilusThrobberClass *klass); -static void nautilus_throbber_initialize (NautilusThrobber *throbber); +static void nautilus_throbber_class_init (NautilusThrobberClass *klass); +static void nautilus_throbber_init (NautilusThrobber *throbber); static void nautilus_throbber_destroy (GtkObject *object); static void nautilus_throbber_draw (GtkWidget *widget, GdkRectangle *box); @@ -96,7 +95,7 @@ static void nautilus_throbber_remove_update_callback (NautilusThrobber *thro EEL_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX) static void -nautilus_throbber_initialize_class (NautilusThrobberClass *throbber_class) +nautilus_throbber_class_init (NautilusThrobberClass *throbber_class) { GtkObjectClass *object_class = GTK_OBJECT_CLASS (throbber_class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (throbber_class); @@ -269,7 +268,7 @@ null_pointer_callback (GtkObject *object, /* initialize the throbber */ static void -nautilus_throbber_initialize (NautilusThrobber *throbber) +nautilus_throbber_init (NautilusThrobber *throbber) { char *delay_str; GtkWidget *widget = GTK_WIDGET (throbber); @@ -566,7 +565,7 @@ load_themed_image (const char *file_name, const char *image_theme, gboolean smal } if (image_path) { - pixbuf = gdk_pixbuf_new_from_file (image_path); + pixbuf = gdk_pixbuf_new_from_file (image_path, NULL); if (small_mode && pixbuf) { temp_pixbuf = gdk_pixbuf_scale_simple (pixbuf, |