Commit 5abcc199 authored by Darin Adler's avatar Darin Adler

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.
parent b36a91ca
2001-10-28 Darin Adler <darin@bentspoon.com>
* 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.
2001-10-25 Thomas Canty <tommydal@optushome.com.au>
* Lots of files:
More work towards compiling under GNOME 2
2001-10-24 Darin Adler <darin@bentspoon.com>
* Lots of files:
......
......@@ -63,7 +63,7 @@ create_pixbufs ()
path = g_strdup_printf ("%s/pixmaps/%s", DATADIR, ICON_NAME);
icon_pixbuf = gdk_pixbuf_new_from_file (path);
icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
g_free (path);
g_assert (icon_pixbuf != NULL);
......
......@@ -212,7 +212,7 @@ main (int argc, char **argv)
exit (1);
}
nautilus_global_preferences_initialize ();
nautilus_global_preferences_init ();
main_hbox = gtk_hbox_new (FALSE, 1);
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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)
{
}
......
......@@ -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);
}
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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)
{
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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));
......
......@@ -30,7 +30,7 @@
#include <eel/eel-debug.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <liboaf/liboaf.h>
#include <bonobo-activation/bonobo-activation.h>
static int object_count = 0;
......@@ -45,12 +45,12 @@ hardware_view_object_destroyed(GtkObject *obj)
static BonoboObject *
hardware_view_make_object (BonoboGenericFactory *factory,
const char *oaf_iid,
const char *bonobo_activation_iid,
void *closure)
{
NautilusView *view;
if (strcmp (oaf_iid, "OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150")) {
if (strcmp (bonobo_activation_iid, "OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150")) {
return NULL;
}
......@@ -86,8 +86,8 @@ int main(int argc, char *argv[])
CORBA_exception_init(&ev);
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-hardware-view", VERSION,
argc, argv);
......@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
g_thread_init (NULL);
gnome_vfs_init ();
registration_id = oaf_make_registration_id ("OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce",
registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce",
getenv ("DISPLAY"));
factory = bonobo_generic_factory_new_multi (registration_id,
hardware_view_make_object,
......
......@@ -33,7 +33,6 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gnome.h>
#include <gtk/gtksignal.h>
#include <libgnorba/gnorba.h>
#include <eel/eel-background.h>
#include <libnautilus-private/nautilus-directory-background.h>
#include <libnautilus-private/nautilus-file-utilities.h>
......@@ -86,8 +85,8 @@ static void nautilus_hardware_view_drag_data_received (GtkWidget
GtkSelectionData *selection_data,
guint info,
guint time);
static void nautilus_hardware_view_initialize_class (NautilusHardwareViewClass *klass);
static void nautilus_hardware_view_initialize (NautilusHardwareView *view);
static void nautilus_hardware_view_class_init (NautilusHardwareViewClass *klass);
static void nautilus_hardware_view_init (NautilusHardwareView *view);
static void nautilus_hardware_view_destroy (GtkObject *object);
static void hardware_view_load_location_callback (NautilusView *view,
const char *location,
......@@ -100,7 +99,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_
#define HARDWARE_DEFAULT_BACKGROUND_COLOR "rgb:DDDD/DDDD/BBBB"
static void
nautilus_hardware_view_initialize_class (NautilusHardwareViewClass *klass)
nautilus_hardware_view_class_init (NautilusHardwareViewClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
......@@ -152,7 +151,7 @@ set_bonobo_properties (BonoboPropertyBag *bag,
/* initialize ourselves by connecting to the load_location signal and allocating our subviews */
static void
nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
nautilus_hardware_view_init (NautilusHardwareView *hardware_view)
{
EelBackground *background;
hardware_view->details = g_new0 (NautilusHardwareViewDetails, 1);
......@@ -172,7 +171,7 @@ nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
/* prepare ourselves to receive dropped objects */
gtk_drag_dest_set (GTK_WIDGET (hardware_view),
GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
hardware_dnd_target_table, EEL_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
hardware_dnd_target_table, G_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
/* allocate a property bag to specify the name of the icon for this component */
hardware_view->details->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, hardware_view);
......
......@@ -25,7 +25,6 @@
#include <ctype.h>
#include <dirent.h>
#include <eel/eel-glib-extensions.h>
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <limits.h>
......@@ -973,7 +972,7 @@ fmt_scrollkeeper_parse_toc_section (HyperbolaDocTree * tree, char **ancestors,
char separator[2] = { '\0' };
next_child = node->xmlChildrenNode;
next_child = node->children;
/* Set up the positioning information for the HyperbolaDocTree */
section = fmt_scrollkeeper_expand_ancestor_list (ancestors, &i);
......@@ -1079,7 +1078,7 @@ fmt_scrollkeeper_parse_doc_toc (HyperbolaDocTree * tree, char **ancestors,
}
/* Process the top-level tocsect nodes in the file */
for (pos = 1, next_child = toc_doc->xmlRootNode->xmlChildrenNode; next_child != NULL;
for (pos = 1, next_child = toc_doc->children->children; next_child != NULL;
next_child = next_child->next) {
if (!g_strncasecmp (next_child->name, "tocsect", 7)) {
fmt_scrollkeeper_parse_toc_section (tree, ancestors,
......@@ -1131,17 +1130,17 @@ fmt_scrollkeeper_parse_document (HyperbolaDocTree * tree, char **ancestors,
toc_location = g_new0 (char, 1024);
next_child = node->xmlChildrenNode;
next_child = node->children;
/* Obtain info about the document from the XML node describing it */
for (; next_child != NULL; next_child = next_child->next) {
if (!g_strcasecmp (next_child->name, "doctitle")) {
doc_data[0] = xmlNodeGetContent (next_child->xmlChildrenNode);
doc_data[0] = xmlNodeGetContent (next_child->children);
} else if (!g_strcasecmp (next_child->name, "docsource")) {
doc_data[1] = xmlNodeGetContent (next_child->xmlChildrenNode);
doc_data[1] = xmlNodeGetContent (next_child->children);
} else if (!g_strcasecmp (next_child->name, "docformat")) {
doc_data[2] = xmlNodeGetContent (next_child->xmlChildrenNode);
doc_data[2] = xmlNodeGetContent (next_child->children);
}
}
......@@ -1228,11 +1227,11 @@ fmt_scrollkeeper_parse_section (HyperbolaDocTree * tree, char **ancestors,
char **section;
int i;
next_child = node->xmlChildrenNode;
next_child = node->children;
/* Make space for this level and add the title of this node to the path */
section = fmt_scrollkeeper_expand_ancestor_list (ancestors, &i);
section[i] = xmlNodeGetContent (next_child->xmlChildrenNode);
section[i] = xmlNodeGetContent (next_child->children);
section[i + 1] = NULL;
/* There is no URI so use this function instead */
......@@ -1272,14 +1271,14 @@ fmt_scrollkeeper_parse_xml (HyperbolaDocTree * tree, char **defpath,
xmlNodePtr node;
/* Ensure the document is valid and a real ScrollKeeper document */
if (!doc->