diff options
Diffstat (limited to 'components/adapter')
11 files changed, 96 insertions, 95 deletions
diff --git a/components/adapter/main.c b/components/adapter/main.c index 31153f595..e3b61a11f 100644 --- a/components/adapter/main.c +++ b/components/adapter/main.c @@ -26,8 +26,7 @@ #include <config.h> -#include <libgnome/gnome-defs.h> /* must come before gnome-init.h */ -#include <libgnomeui/gnome-init.h> /* must come before liboaf.h */ +#include <libgnome/gnome-init.h> /* must come before liboaf.h */ #include "nautilus-adapter-factory-server.h" #include <bonobo/bonobo-generic-factory.h> @@ -36,7 +35,7 @@ #include <gtk/gtksignal.h> #include <libgnomevfs/gnome-vfs-init.h> #include <eel/eel-debug.h> -#include <liboaf/liboaf.h> +#include <bonobo-activation/bonobo-activation.h> #include <stdlib.h> #define META_FACTORY_IID "OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" @@ -100,8 +99,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); /* Initialize libraries. */ gnome_init ("nautilus-adapter", VERSION, @@ -112,7 +111,7 @@ main (int argc, char *argv[]) /* Create the factory. */ - registration_id = oaf_make_registration_id (META_FACTORY_IID, g_getenv ("DISPLAY")); + registration_id = bonobo_activation_make_registration_id (META_FACTORY_IID, g_getenv ("DISPLAY")); factory = bonobo_generic_factory_new_multi (registration_id, adapter_factory_make_object, NULL); diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.c b/components/adapter/nautilus-adapter-control-embed-strategy.c index 280a349aa..2fea826bf 100644 --- a/components/adapter/nautilus-adapter-control-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-embed-strategy.c @@ -47,8 +47,8 @@ struct NautilusAdapterControlEmbedStrategyDetails { }; -static void nautilus_adapter_control_embed_strategy_initialize_class (NautilusAdapterControlEmbedStrategyClass *klass); -static void nautilus_adapter_control_embed_strategy_initialize (NautilusAdapterControlEmbedStrategy *strategy); +static void nautilus_adapter_control_embed_strategy_class_init (NautilusAdapterControlEmbedStrategyClass *klass); +static void nautilus_adapter_control_embed_strategy_init (NautilusAdapterControlEmbedStrategy *strategy); static void nautilus_adapter_control_embed_strategy_activate (NautilusAdapterEmbedStrategy *object, gpointer ui_container); static void nautilus_adapter_control_embed_strategy_deactivate (NautilusAdapterEmbedStrategy *object); @@ -62,7 +62,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adap static void -nautilus_adapter_control_embed_strategy_initialize_class (NautilusAdapterControlEmbedStrategyClass *klass) +nautilus_adapter_control_embed_strategy_class_init (NautilusAdapterControlEmbedStrategyClass *klass) { GtkObjectClass *object_class; NautilusAdapterEmbedStrategyClass *adapter_embed_strategy_class; @@ -80,7 +80,7 @@ nautilus_adapter_control_embed_strategy_initialize_class (NautilusAdapterControl } static void -nautilus_adapter_control_embed_strategy_initialize (NautilusAdapterControlEmbedStrategy *strategy) +nautilus_adapter_control_embed_strategy_init (NautilusAdapterControlEmbedStrategy *strategy) { strategy->details = g_new0 (NautilusAdapterControlEmbedStrategyDetails, 1); } diff --git a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c index 6fcef3cf0..0d5b4caf5 100644 --- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c @@ -49,8 +49,8 @@ struct NautilusAdapterEmbeddableEmbedStrategyDetails { }; -static void nautilus_adapter_embeddable_embed_strategy_initialize_class (NautilusAdapterEmbeddableEmbedStrategyClass *klass); -static void nautilus_adapter_embeddable_embed_strategy_initialize (NautilusAdapterEmbeddableEmbedStrategy *strategy); +static void nautilus_adapter_embeddable_embed_strategy_class_init (NautilusAdapterEmbeddableEmbedStrategyClass *klass); +static void nautilus_adapter_embeddable_embed_strategy_init (NautilusAdapterEmbeddableEmbedStrategy *strategy); static void nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object); static void nautilus_adapter_embeddable_embed_strategy_activate (NautilusAdapterEmbedStrategy *object, gpointer ui_container); @@ -65,7 +65,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_a static void -nautilus_adapter_embeddable_embed_strategy_initialize_class (NautilusAdapterEmbeddableEmbedStrategyClass *klass) +nautilus_adapter_embeddable_embed_strategy_class_init (NautilusAdapterEmbeddableEmbedStrategyClass *klass) { GtkObjectClass *object_class; NautilusAdapterEmbedStrategyClass *adapter_embed_strategy_class; @@ -83,7 +83,7 @@ nautilus_adapter_embeddable_embed_strategy_initialize_class (NautilusAdapterEmbe } static void -nautilus_adapter_embeddable_embed_strategy_initialize (NautilusAdapterEmbeddableEmbedStrategy *strategy) +nautilus_adapter_embeddable_embed_strategy_init (NautilusAdapterEmbeddableEmbedStrategy *strategy) { strategy->details = g_new0 (NautilusAdapterEmbeddableEmbedStrategyDetails, 1); } diff --git a/components/adapter/nautilus-adapter-embed-strategy.c b/components/adapter/nautilus-adapter-embed-strategy.c index 552d3c0e9..5b7e3d4b9 100644 --- a/components/adapter/nautilus-adapter-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embed-strategy.c @@ -48,8 +48,8 @@ enum { static guint signals[LAST_SIGNAL]; -static void nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyClass *klass); -static void nautilus_adapter_embed_strategy_initialize (NautilusAdapterEmbedStrategy *strategy); +static void nautilus_adapter_embed_strategy_class_init (NautilusAdapterEmbedStrategyClass *klass); +static void nautilus_adapter_embed_strategy_init (NautilusAdapterEmbedStrategy *strategy); EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy, nautilus_adapter_embed_strategy, @@ -59,42 +59,43 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_widget) EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_zoomable) static void -nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyClass *klass) +nautilus_adapter_embed_strategy_class_init (NautilusAdapterEmbedStrategyClass *klass) { GtkObjectClass *object_class; object_class = (GtkObjectClass *) klass; signals[ACTIVATE] = - gtk_signal_new ("activate", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, activate), - gtk_marshal_NONE__POINTER, - GTK_TYPE_POINTER, 0); + g_signal_new ("activate", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterEmbedStrategyClass, activate), + NULL, NULL, + gtk_marshal_NONE__POINTER, + GTK_TYPE_POINTER, 0); signals[DEACTIVATE] = - gtk_signal_new ("deactivate", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, deactivate), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("deactivate", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterEmbedStrategyClass, deactivate), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); signals[OPEN_LOCATION] = - gtk_signal_new ("open_location", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, open_location), - gtk_marshal_NONE__STRING, - GTK_TYPE_STRING, 0); - - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + g_signal_new ("open_location", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterEmbedStrategyClass, open_location), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_STRING, 0); EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_widget); EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_zoomable); } static void -nautilus_adapter_embed_strategy_initialize (NautilusAdapterEmbedStrategy *strategy) +nautilus_adapter_embed_strategy_init (NautilusAdapterEmbedStrategy *strategy) { } diff --git a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c index 6fcef3cf0..0d5b4caf5 100644 --- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c @@ -49,8 +49,8 @@ struct NautilusAdapterEmbeddableEmbedStrategyDetails { }; -static void nautilus_adapter_embeddable_embed_strategy_initialize_class (NautilusAdapterEmbeddableEmbedStrategyClass *klass); -static void nautilus_adapter_embeddable_embed_strategy_initialize (NautilusAdapterEmbeddableEmbedStrategy *strategy); +static void nautilus_adapter_embeddable_embed_strategy_class_init (NautilusAdapterEmbeddableEmbedStrategyClass *klass); +static void nautilus_adapter_embeddable_embed_strategy_init (NautilusAdapterEmbeddableEmbedStrategy *strategy); static void nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object); static void nautilus_adapter_embeddable_embed_strategy_activate (NautilusAdapterEmbedStrategy *object, gpointer ui_container); @@ -65,7 +65,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_a static void -nautilus_adapter_embeddable_embed_strategy_initialize_class (NautilusAdapterEmbeddableEmbedStrategyClass *klass) +nautilus_adapter_embeddable_embed_strategy_class_init (NautilusAdapterEmbeddableEmbedStrategyClass *klass) { GtkObjectClass *object_class; NautilusAdapterEmbedStrategyClass *adapter_embed_strategy_class; @@ -83,7 +83,7 @@ nautilus_adapter_embeddable_embed_strategy_initialize_class (NautilusAdapterEmbe } static void -nautilus_adapter_embeddable_embed_strategy_initialize (NautilusAdapterEmbeddableEmbedStrategy *strategy) +nautilus_adapter_embeddable_embed_strategy_init (NautilusAdapterEmbeddableEmbedStrategy *strategy) { strategy->details = g_new0 (NautilusAdapterEmbeddableEmbedStrategyDetails, 1); } diff --git a/components/adapter/nautilus-adapter-factory-server.c b/components/adapter/nautilus-adapter-factory-server.c index d1ce8a0d5..a2ac04786 100644 --- a/components/adapter/nautilus-adapter-factory-server.c +++ b/components/adapter/nautilus-adapter-factory-server.c @@ -34,7 +34,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtksignal.h> #include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-stock.h> +#include <libgnomeui/gnome-stock-icons.h> #include <libnautilus-adapter/nautilus-adapter-factory.h> #include <eel/eel-gtk-macros.h> #include <libnautilus/nautilus-bonobo-ui.h> @@ -79,8 +79,8 @@ static POA_Nautilus_ComponentAdapterFactory__vepv impl_Nautilus_ComponentAdapter -static void nautilus_adapter_factory_server_initialize_class (NautilusAdapterFactoryServerClass *klass); -static void nautilus_adapter_factory_server_initialize (NautilusAdapterFactoryServer *server); +static void nautilus_adapter_factory_server_class_init (NautilusAdapterFactoryServerClass *klass); +static void nautilus_adapter_factory_server_init (NautilusAdapterFactoryServer *server); static void nautilus_adapter_factory_server_destroy (GtkObject *object); @@ -91,7 +91,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFactoryServer, static void -nautilus_adapter_factory_server_initialize_class (NautilusAdapterFactoryServerClass *klass) +nautilus_adapter_factory_server_class_init (NautilusAdapterFactoryServerClass *klass) { GtkObjectClass *object_class; @@ -103,7 +103,7 @@ nautilus_adapter_factory_server_initialize_class (NautilusAdapterFactoryServerCl } static void -nautilus_adapter_factory_server_initialize (NautilusAdapterFactoryServer *server) +nautilus_adapter_factory_server_init (NautilusAdapterFactoryServer *server) { CORBA_Environment ev; diff --git a/components/adapter/nautilus-adapter-file-load-strategy.c b/components/adapter/nautilus-adapter-file-load-strategy.c index ba586ab2b..57eaca645 100644 --- a/components/adapter/nautilus-adapter-file-load-strategy.c +++ b/components/adapter/nautilus-adapter-file-load-strategy.c @@ -43,8 +43,8 @@ struct NautilusAdapterFileLoadStrategyDetails { }; -static void nautilus_adapter_file_load_strategy_initialize_class (NautilusAdapterFileLoadStrategyClass *klass); -static void nautilus_adapter_file_load_strategy_initialize (NautilusAdapterFileLoadStrategy *strategy); +static void nautilus_adapter_file_load_strategy_class_init (NautilusAdapterFileLoadStrategyClass *klass); +static void nautilus_adapter_file_load_strategy_init (NautilusAdapterFileLoadStrategy *strategy); static void nautilus_adapter_file_load_strategy_destroy (GtkObject *object); static void nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLoadStrategy *strategy, @@ -57,7 +57,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_ static void -nautilus_adapter_file_load_strategy_initialize_class (NautilusAdapterFileLoadStrategyClass *klass) +nautilus_adapter_file_load_strategy_class_init (NautilusAdapterFileLoadStrategyClass *klass) { GtkObjectClass *object_class; NautilusAdapterLoadStrategyClass *adapter_load_strategy_class; @@ -73,7 +73,7 @@ nautilus_adapter_file_load_strategy_initialize_class (NautilusAdapterFileLoadStr } static void -nautilus_adapter_file_load_strategy_initialize (NautilusAdapterFileLoadStrategy *strategy) +nautilus_adapter_file_load_strategy_init (NautilusAdapterFileLoadStrategy *strategy) { strategy->details = g_new0 (NautilusAdapterFileLoadStrategyDetails, 1); } diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c index 5a7c490af..d14adf6f9 100644 --- a/components/adapter/nautilus-adapter-load-strategy.c +++ b/components/adapter/nautilus-adapter-load-strategy.c @@ -53,8 +53,8 @@ static guint signals[LAST_SIGNAL]; -static void nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClass *klass); -static void nautilus_adapter_load_strategy_initialize (NautilusAdapterLoadStrategy *strategy); +static void nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *klass); +static void nautilus_adapter_load_strategy_init (NautilusAdapterLoadStrategy *strategy); static void nautilus_adapter_load_strategy_destroy (GtkObject *object); EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT) @@ -63,7 +63,7 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, load_locatio EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, stop_loading) static void -nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClass *klass) +nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *klass) { GtkObjectClass *object_class; @@ -76,39 +76,41 @@ nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClas signals[REPORT_LOAD_UNDERWAY] = - gtk_signal_new ("report_load_underway", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterLoadStrategyClass, report_load_underway), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("report_load_underway", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_underway), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); signals[REPORT_LOAD_PROGRESS] = - gtk_signal_new ("report_load_progress", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress), - eel_gtk_marshal_NONE__DOUBLE, - GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE); + g_signal_new ("report_load_progress", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress), + NULL, NULL, + eel_gtk_marshal_NONE__DOUBLE, + G_TYPE_NONE, 1, GTK_TYPE_DOUBLE); signals[REPORT_LOAD_COMPLETE] = - gtk_signal_new ("report_load_complete", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterLoadStrategyClass, report_load_complete), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("report_load_complete", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_complete), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); signals[REPORT_LOAD_FAILED] = - gtk_signal_new ("report_load_failed", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusAdapterLoadStrategyClass, report_load_failed), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + g_signal_new ("report_load_failed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_failed), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); } static void -nautilus_adapter_load_strategy_initialize (NautilusAdapterLoadStrategy *strategy) +nautilus_adapter_load_strategy_init (NautilusAdapterLoadStrategy *strategy) { } diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c index 81d998c83..b29c92a73 100644 --- a/components/adapter/nautilus-adapter-progressive-load-strategy.c +++ b/components/adapter/nautilus-adapter-progressive-load-strategy.c @@ -54,8 +54,8 @@ struct NautilusAdapterProgressiveLoadStrategyDetails { }; -static void nautilus_adapter_progressive_load_strategy_initialize_class (NautilusAdapterProgressiveLoadStrategyClass *klass); -static void nautilus_adapter_progressive_load_strategy_initialize (NautilusAdapterProgressiveLoadStrategy *strategy); +static void nautilus_adapter_progressive_load_strategy_class_init (NautilusAdapterProgressiveLoadStrategyClass *klass); +static void nautilus_adapter_progressive_load_strategy_init (NautilusAdapterProgressiveLoadStrategy *strategy); static void nautilus_adapter_progressive_load_strategy_destroy (GtkObject *object); static void nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStrategy *strategy, @@ -68,7 +68,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_a static void -nautilus_adapter_progressive_load_strategy_initialize_class (NautilusAdapterProgressiveLoadStrategyClass *klass) +nautilus_adapter_progressive_load_strategy_class_init (NautilusAdapterProgressiveLoadStrategyClass *klass) { GtkObjectClass *object_class; NautilusAdapterLoadStrategyClass *adapter_load_strategy_class; @@ -84,7 +84,7 @@ nautilus_adapter_progressive_load_strategy_initialize_class (NautilusAdapterProg } static void -nautilus_adapter_progressive_load_strategy_initialize (NautilusAdapterProgressiveLoadStrategy *strategy) +nautilus_adapter_progressive_load_strategy_init (NautilusAdapterProgressiveLoadStrategy *strategy) { strategy->details = g_new0 (NautilusAdapterProgressiveLoadStrategyDetails, 1); } diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.c b/components/adapter/nautilus-adapter-stream-load-strategy.c index 08e8e4e7a..fcba74565 100644 --- a/components/adapter/nautilus-adapter-stream-load-strategy.c +++ b/components/adapter/nautilus-adapter-stream-load-strategy.c @@ -42,8 +42,8 @@ struct NautilusAdapterStreamLoadStrategyDetails { }; -static void nautilus_adapter_stream_load_strategy_initialize_class (NautilusAdapterStreamLoadStrategyClass *klass); -static void nautilus_adapter_stream_load_strategy_initialize (NautilusAdapterStreamLoadStrategy *strategy); +static void nautilus_adapter_stream_load_strategy_class_init (NautilusAdapterStreamLoadStrategyClass *klass); +static void nautilus_adapter_stream_load_strategy_init (NautilusAdapterStreamLoadStrategy *strategy); static void nautilus_adapter_stream_load_strategy_destroy (GtkObject *object); static void nautilus_adapter_stream_load_strategy_load_location (NautilusAdapterLoadStrategy *strategy, @@ -56,7 +56,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapte static void -nautilus_adapter_stream_load_strategy_initialize_class (NautilusAdapterStreamLoadStrategyClass *klass) +nautilus_adapter_stream_load_strategy_class_init (NautilusAdapterStreamLoadStrategyClass *klass) { GtkObjectClass *object_class; NautilusAdapterLoadStrategyClass *adapter_load_strategy_class; @@ -72,7 +72,7 @@ nautilus_adapter_stream_load_strategy_initialize_class (NautilusAdapterStreamLoa } static void -nautilus_adapter_stream_load_strategy_initialize (NautilusAdapterStreamLoadStrategy *strategy) +nautilus_adapter_stream_load_strategy_init (NautilusAdapterStreamLoadStrategy *strategy) { strategy->details = g_new0 (NautilusAdapterStreamLoadStrategyDetails, 1); } diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 274f9cced..da6adacf7 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -33,14 +33,13 @@ #include "nautilus-adapter-load-strategy.h" #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-item-container.h> -#include <bonobo/bonobo-object-client.h> #include <bonobo/bonobo-view-frame.h> #include <eel/eel-generous-bin.h> #include <eel/eel-gtk-macros.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtksignal.h> #include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-stock.h> +#include <libgnomeui/gnome-stock-icons.h> #include <libnautilus-adapter/nautilus-adapter-factory.h> #include <libnautilus/nautilus-bonobo-ui.h> @@ -71,8 +70,8 @@ static void nautilus_adapter_load_progress_callback (NautilusAdapter double fraction_complete); static void nautilus_adapter_load_complete_callback (NautilusAdapter *adapter); static void nautilus_adapter_load_failed_callback (NautilusAdapter *adapter); -static void nautilus_adapter_initialize_class (NautilusAdapterClass *klass); -static void nautilus_adapter_initialize (NautilusAdapter *server); +static void nautilus_adapter_class_init (NautilusAdapterClass *klass); +static void nautilus_adapter_init (NautilusAdapter *server); static void nautilus_adapter_destroy (GtkObject *object); @@ -82,7 +81,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapter, static void -nautilus_adapter_initialize_class (NautilusAdapterClass *klass) +nautilus_adapter_class_init (NautilusAdapterClass *klass) { GtkObjectClass *object_class; @@ -92,7 +91,7 @@ nautilus_adapter_initialize_class (NautilusAdapterClass *klass) } static void -nautilus_adapter_initialize (NautilusAdapter *adapter) +nautilus_adapter_init (NautilusAdapter *adapter) { adapter->details = g_new0 (NautilusAdapterDetails, 1); gtk_object_ref (GTK_OBJECT (adapter)); |