summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--applets/launcher/nautilus-launcher-applet.c2
-rw-r--r--applets/preferences-applet/nautilus-preferences-applet.c2
-rw-r--r--components/adapter/main.c11
-rw-r--r--components/adapter/nautilus-adapter-control-embed-strategy.c8
-rw-r--r--components/adapter/nautilus-adapter-control-factory-embed-strategy.c8
-rw-r--r--components/adapter/nautilus-adapter-embed-strategy.c49
-rw-r--r--components/adapter/nautilus-adapter-embeddable-embed-strategy.c8
-rw-r--r--components/adapter/nautilus-adapter-factory-server.c10
-rw-r--r--components/adapter/nautilus-adapter-file-load-strategy.c8
-rw-r--r--components/adapter/nautilus-adapter-load-strategy.c62
-rw-r--r--components/adapter/nautilus-adapter-progressive-load-strategy.c8
-rw-r--r--components/adapter/nautilus-adapter-stream-load-strategy.c8
-rw-r--r--components/adapter/nautilus-adapter.c11
-rw-r--r--components/hardware/main.c12
-rw-r--r--components/hardware/nautilus-hardware-view.c11
-rw-r--r--components/help/hyperbola-filefmt.c55
-rw-r--r--components/help/hyperbola-main.c12
-rw-r--r--components/help/hyperbola-nav-tree.c3
-rw-r--r--components/history/nautilus-history-view.c10
-rw-r--r--components/image-viewer/nautilus-image-view.c14
-rw-r--r--components/loser/content/main.c8
-rw-r--r--components/loser/content/nautilus-content-loser.c10
-rw-r--r--components/loser/sidebar/main.c8
-rw-r--r--components/loser/sidebar/nautilus-sidebar-loser.c10
-rw-r--r--components/mozilla/bonobo-extensions.c6
-rw-r--r--components/mozilla/main.c8
-rw-r--r--components/mozilla/nautilus-mozilla-content-view.c26
-rw-r--r--components/mozilla/nautilus-mozilla-encoding-tables.c1
-rw-r--r--components/music/main.c2
-rw-r--r--components/music/nautilus-music-view.c16
-rw-r--r--components/news/nautilus-news.c15
-rw-r--r--components/notes/nautilus-notes.c2
-rw-r--r--components/sample/nautilus-sample-content-view.c14
-rw-r--r--components/shell/shell.c10
-rw-r--r--components/text/main.c2
-rw-r--r--components/text/nautilus-text-view.c10
-rw-r--r--components/throbber/main.c8
-rw-r--r--components/throbber/nautilus-throbber.c11
-rw-r--r--components/tree/libmain.c8
-rw-r--r--components/tree/nautilus-tree-change-queue.c8
-rw-r--r--components/tree/nautilus-tree-expansion-state.c8
-rw-r--r--components/tree/nautilus-tree-model.c63
-rw-r--r--components/tree/nautilus-tree-node.c8
-rw-r--r--components/tree/nautilus-tree-view-dnd.c6
-rw-r--r--components/tree/nautilus-tree-view.c8
-rw-r--r--configure.in33
-rw-r--r--cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c13
-rw-r--r--helper-utilities/error-dialog/nautilus-error-dialog.c2
-rw-r--r--libnautilus-adapter/Makefile.am7
-rw-r--r--libnautilus-private/Makefile.am16
-rw-r--r--libnautilus-private/nautilus-authn-manager.c2
-rw-r--r--libnautilus-private/nautilus-authn-manager.h2
-rw-r--r--libnautilus-private/nautilus-bonobo-extensions.c7
-rw-r--r--libnautilus-private/nautilus-bookmark.c48
-rw-r--r--libnautilus-private/nautilus-customization-data.c18
-rw-r--r--libnautilus-private/nautilus-desktop-file-loader.c2
-rw-r--r--libnautilus-private/nautilus-directory-async.c89
-rw-r--r--libnautilus-private/nautilus-directory-background.c58
-rw-r--r--libnautilus-private/nautilus-directory-metafile-monitor.c2
-rw-r--r--libnautilus-private/nautilus-directory-metafile.c10
-rw-r--r--libnautilus-private/nautilus-directory-private.h1
-rw-r--r--libnautilus-private/nautilus-directory.c64
-rw-r--r--libnautilus-private/nautilus-drag-window.c66
-rw-r--r--libnautilus-private/nautilus-druid-page-eazel.c697
-rw-r--r--libnautilus-private/nautilus-druid-page-eazel.h100
-rw-r--r--libnautilus-private/nautilus-druid.c204
-rw-r--r--libnautilus-private/nautilus-druid.h57
-rw-r--r--libnautilus-private/nautilus-entry.c80
-rw-r--r--libnautilus-private/nautilus-entry.h1
-rw-r--r--libnautilus-private/nautilus-file-operations-progress.c10
-rw-r--r--libnautilus-private/nautilus-file-operations.c45
-rw-r--r--libnautilus-private/nautilus-file-utilities.c1
-rw-r--r--libnautilus-private/nautilus-file.c66
-rw-r--r--libnautilus-private/nautilus-find-icon-image.c7
-rw-r--r--libnautilus-private/nautilus-font-factory.c18
-rw-r--r--libnautilus-private/nautilus-global-preferences.c14
-rw-r--r--libnautilus-private/nautilus-global-preferences.h2
-rw-r--r--libnautilus-private/nautilus-horizontal-splitter.c8
-rw-r--r--libnautilus-private/nautilus-horizontal-splitter.h1
-rw-r--r--libnautilus-private/nautilus-icon-canvas-item.c39
-rw-r--r--libnautilus-private/nautilus-icon-canvas-item.h3
-rw-r--r--libnautilus-private/nautilus-icon-container.c366
-rw-r--r--libnautilus-private/nautilus-icon-container.h2
-rw-r--r--libnautilus-private/nautilus-icon-dnd.c10
-rw-r--r--libnautilus-private/nautilus-icon-factory.c32
-rw-r--r--libnautilus-private/nautilus-icon-factory.h5
-rw-r--r--libnautilus-private/nautilus-icon-text-item.c88
-rw-r--r--libnautilus-private/nautilus-icon-text-item.h5
-rw-r--r--libnautilus-private/nautilus-keep-last-vertical-box.c8
-rw-r--r--libnautilus-private/nautilus-link-desktop-file.c4
-rw-r--r--libnautilus-private/nautilus-link-desktop-file.h2
-rw-r--r--libnautilus-private/nautilus-link-historical.c4
-rw-r--r--libnautilus-private/nautilus-link-historical.h2
-rw-r--r--libnautilus-private/nautilus-link.h5
-rw-r--r--libnautilus-private/nautilus-medusa-support.c1
-rw-r--r--libnautilus-private/nautilus-merged-directory.c36
-rw-r--r--libnautilus-private/nautilus-metafile.c2
-rw-r--r--libnautilus-private/nautilus-mime-actions.c66
-rw-r--r--libnautilus-private/nautilus-monitor.c1
-rw-r--r--libnautilus-private/nautilus-program-chooser.c13
-rw-r--r--libnautilus-private/nautilus-search-uri.c1
-rw-r--r--libnautilus-private/nautilus-sidebar-functions.c16
-rw-r--r--libnautilus-private/nautilus-sound.c4
-rw-r--r--libnautilus-private/nautilus-sound.h2
-rw-r--r--libnautilus-private/nautilus-theme.c7
-rw-r--r--libnautilus-private/nautilus-thumbnails-jpeg.c2
-rw-r--r--libnautilus-private/nautilus-thumbnails.c2
-rw-r--r--libnautilus-private/nautilus-trash-directory.c11
-rw-r--r--libnautilus-private/nautilus-trash-file.c11
-rw-r--r--libnautilus-private/nautilus-trash-monitor.c32
-rw-r--r--libnautilus-private/nautilus-undo-context.c8
-rw-r--r--libnautilus-private/nautilus-undo-manager.c21
-rw-r--r--libnautilus-private/nautilus-undo-signal-handlers.c1
-rw-r--r--libnautilus-private/nautilus-vfs-directory.c8
-rw-r--r--libnautilus-private/nautilus-vfs-file.c8
-rw-r--r--libnautilus-private/nautilus-view-identifier.c23
-rw-r--r--libnautilus-private/nautilus-view-identifier.h24
-rw-r--r--libnautilus-private/nautilus-volume-monitor.c65
-rw-r--r--libnautilus/Makefile.am2
-rw-r--r--libnautilus/nautilus-undo-transaction.c81
-rw-r--r--libnautilus/nautilus-undo-transaction.h1
-rw-r--r--libnautilus/nautilus-undo.c2
-rw-r--r--libnautilus/nautilus-view-standard-main.c28
-rw-r--r--libnautilus/nautilus-view.c199
-rw-r--r--libnautilus/nautilus-view.h1
-rw-r--r--src/file-manager/fm-desktop-icon-view.c10
-rw-r--r--src/file-manager/fm-directory-view.c139
-rw-r--r--src/file-manager/fm-error-reporting.c1
-rw-r--r--src/file-manager/fm-icon-view.c15
-rw-r--r--src/file-manager/fm-list-view.c8
-rw-r--r--src/file-manager/fm-properties-window.c13
-rw-r--r--src/file-manager/fm-search-list-view.c8
-rw-r--r--src/file-manager/nautilus-indexing-info.c1
-rw-r--r--src/nautilus-about.c11
-rw-r--r--src/nautilus-applicable-views.c2
-rw-r--r--src/nautilus-application.c23
-rw-r--r--src/nautilus-bookmark-list.c17
-rw-r--r--src/nautilus-complex-search-bar.c10
-rw-r--r--src/nautilus-component-adapter-factory.c8
-rw-r--r--src/nautilus-component-adapter-factory.h1
-rw-r--r--src/nautilus-desktop-window.c10
-rw-r--r--src/nautilus-first-time-druid.c2
-rw-r--r--src/nautilus-information-panel.c27
-rw-r--r--src/nautilus-location-bar.c16
-rw-r--r--src/nautilus-main.c15
-rw-r--r--src/nautilus-navigation-bar.c34
-rw-r--r--src/nautilus-navigation-window.c10
-rw-r--r--src/nautilus-navigation-window.h2
-rw-r--r--src/nautilus-object-window.c10
-rw-r--r--src/nautilus-object-window.h2
-rw-r--r--src/nautilus-preferences-dialog.c2
-rw-r--r--src/nautilus-property-browser.c19
-rw-r--r--src/nautilus-search-bar-criterion.c20
-rw-r--r--src/nautilus-search-bar.c8
-rw-r--r--src/nautilus-shell.c10
-rw-r--r--src/nautilus-sidebar-tabs.c13
-rw-r--r--src/nautilus-sidebar-title.c8
-rw-r--r--src/nautilus-sidebar.c27
-rw-r--r--src/nautilus-signaller.c36
-rw-r--r--src/nautilus-simple-search-bar.c8
-rw-r--r--src/nautilus-spatial-window.c10
-rw-r--r--src/nautilus-spatial-window.h2
-rw-r--r--src/nautilus-switchable-navigation-bar.c24
-rw-r--r--src/nautilus-switchable-search-bar.c9
-rw-r--r--src/nautilus-theme-selector.c26
-rw-r--r--src/nautilus-theme-selector.h1
-rw-r--r--src/nautilus-view-frame.c207
-rw-r--r--src/nautilus-view-frame.h1
-rw-r--r--src/nautilus-window-toolbars.c3
-rw-r--r--src/nautilus-window.c10
-rw-r--r--src/nautilus-window.h2
-rw-r--r--src/nautilus-zoom-control.c65
-rw-r--r--test/test-nautilus-async-activation.c2
-rw-r--r--test/test-nautilus-mime-actions-set.c4
-rw-r--r--test/test-nautilus-mime-actions.c8
-rw-r--r--test/test-nautilus-preferences-change.c2
-rw-r--r--test/test-nautilus-preferences-display.c2
-rw-r--r--test/test-nautilus-smooth-graphics.c5
-rw-r--r--test/test.c2
180 files changed, 1705 insertions, 2831 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ecee0ce6..692495478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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:
diff --git a/applets/launcher/nautilus-launcher-applet.c b/applets/launcher/nautilus-launcher-applet.c
index e0457f83e..340f72424 100644
--- a/applets/launcher/nautilus-launcher-applet.c
+++ b/applets/launcher/nautilus-launcher-applet.c
@@ -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);
diff --git a/applets/preferences-applet/nautilus-preferences-applet.c b/applets/preferences-applet/nautilus-preferences-applet.c
index e8c630410..6cf16fef8 100644
--- a/applets/preferences-applet/nautilus-preferences-applet.c
+++ b/applets/preferences-applet/nautilus-preferences-applet.c
@@ -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);
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));
diff --git a/components/hardware/main.c b/components/hardware/main.c
index 4dbd10a6b..b72fbabe8 100644
--- a/components/hardware/main.c
+++ b/components/hardware/main.c
@@ -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,
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
index e0de1f7c1..2e77be412 100644
--- a/components/hardware/nautilus-hardware-view.c
+++ b/components/hardware/nautilus-hardware-view.c
@@ -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);
diff --git a/components/help/hyperbola-filefmt.c b/components/help/hyperbola-filefmt.c
index 0afc791a8..1efea8a3d 100644
--- a/components/help/hyperbola-filefmt.c
+++ b/components/help/hyperbola-filefmt.c
@@ -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->xmlRootNode || !doc->xmlRootNode->name ||
- g_strcasecmp (doc->xmlRootNode->name, "ScrollKeeperContentsList")) {
+ if (!doc->children || !doc->children->name ||
+ g_strcasecmp (doc->children->name, "ScrollKeeperContentsList")) {
g_warning ("Invalid ScrollKeeper XML Contents List!");
return;
}
/* Start parsing the list and add to the tree */
- for (node = doc->xmlRootNode->xmlChildrenNode; node != NULL; node = node->next) {
+ for (node = doc->children->children; node != NULL; node = node->next) {
if (!g_strcasecmp (node->name, "sect"))
fmt_scrollkeeper_parse_section (tree, defpath, node);
}
@@ -1304,12 +1303,12 @@ fmt_scrollkeeper_trim_empty_branches (xmlNodePtr cl_node)
next = node->next;
if (!strcmp (node->name, "sect") &&
- node->xmlChildrenNode->next !=
+ node->children->next !=
NULL) fmt_scrollkeeper_trim_empty_branches (node->
- xmlChildrenNode->next);
+ children->next);
if (!strcmp (node->name, "sect") &&
- node->xmlChildrenNode->next == NULL) {
+ node->children->next == NULL) {
xmlUnlinkNode (node);
xmlFreeNode (node);
}
@@ -1330,8 +1329,8 @@ fmt_scrollkeeper_tree_empty (xmlNodePtr cl_node)
next = node->next;
if (!strcmp (node->name, "sect") &&
- node->xmlChildrenNode->next != NULL) {
- ret_val = fmt_scrollkeeper_tree_empty (node->xmlChildrenNode->next);
+ node->children->next != NULL) {
+ ret_val = fmt_scrollkeeper_tree_empty (node->children->next);
if (!ret_val)
return ret_val;
}
@@ -1418,7 +1417,7 @@ fmt_scrollkeeper_populate_tree (HyperbolaDocTree * tree)
node = node->next) {
doc = fmt_scrollkeeper_get_xml_tree_of_locale (node->data);
if (doc != NULL) {
- if (doc->xmlRootNode != NULL && !fmt_scrollkeeper_tree_empty(doc->xmlRootNode->xmlChildrenNode)) {
+ if (doc->children != NULL && !fmt_scrollkeeper_tree_empty(doc->children->children)) {
break;
} else {
xmlFreeDoc (doc);
@@ -1428,7 +1427,7 @@ fmt_scrollkeeper_populate_tree (HyperbolaDocTree * tree)
}
if (doc) {
- fmt_scrollkeeper_trim_empty_branches (doc->xmlRootNode->xmlChildrenNode);
+ fmt_scrollkeeper_trim_empty_branches (doc->children->children);
fmt_scrollkeeper_parse_xml (tree, tree_path, doc);
xmlFreeDoc (doc);
}
@@ -1475,13 +1474,13 @@ fmt_toplevel_add_doc (HyperbolaDocTree * tree, char * omf_name)
if (doc == NULL)
return;
- if (doc->xmlRootNode == NULL || doc->xmlRootNode->xmlChildrenNode == NULL ||
- doc->xmlRootNode->xmlChildrenNode->xmlChildrenNode == NULL) {
+ if (doc->children == NULL || doc->children->children == NULL ||
+ doc->children->children->children == NULL) {
xmlFreeDoc(doc);
return;
}
- for(node = doc->xmlRootNode->xmlChildrenNode->xmlChildrenNode; node != NULL;
+ for(node = doc->children->children->children; node != NULL;
node = node->next) {
if (!strcmp(node->name, "identifier")) {
doc_path = xmlGetProp(node, "url");
@@ -1491,7 +1490,7 @@ fmt_toplevel_add_doc (HyperbolaDocTree * tree, char * omf_name)
if (!strcmp(node->name, "title")) {
char *ptr;
- ptr = xmlNodeGetContent (node->xmlChildrenNode);
+ ptr = xmlNodeGetContent (node->children);
if (ptr != NULL) {
str = remove_leading_and_trailing_white_spaces (ptr);
title = g_strconcat (prefix, str, NULL);
@@ -1613,7 +1612,7 @@ get_path_from_node (const char *omf_dir, xmlNode *docpath_node)
{
char *str, *omf_path, *omf_name;
- str = xmlNodeGetContent (docpath_node->xmlChildrenNode);
+ str = xmlNodeGetContent (docpath_node->children);
omf_name = remove_leading_and_trailing_white_spaces (str);
omf_path = g_strdup_printf ("%s/%s", omf_dir, omf_name);
@@ -1645,7 +1644,7 @@ fmt_toplevel_parse_xml_tree (HyperbolaDocTree * tree,
int bytes_read;
gboolean node_added;
- if (doc == NULL || doc->xmlRootNode == NULL)
+ if (doc == NULL || doc->children == NULL)
return FALSE;
if (locales == NULL)
@@ -1669,7 +1668,7 @@ fmt_toplevel_parse_xml_tree (HyperbolaDocTree * tree,
node_added = FALSE;
- for(doc_node = doc->xmlRootNode->xmlChildrenNode; doc_node != NULL;
+ for(doc_node = doc->children->children; doc_node != NULL;
doc_node = doc_node->next) {
/* nothing found yet */
@@ -1677,11 +1676,11 @@ fmt_toplevel_parse_xml_tree (HyperbolaDocTree * tree,
/* check out the doc for the current locale */
- for(docpath_node = doc_node->xmlChildrenNode;
+ for(docpath_node = doc_node->children;
docpath_node != NULL;
docpath_node = docpath_node->next) {
/* check validity of the node first */
- if (has_content (docpath_node->xmlChildrenNode)
+ if (has_content (docpath_node->children)
&& is_new_locale_better (locales,
best_path_node,
docpath_node)) {
diff --git a/components/help/hyperbola-main.c b/components/help/hyperbola-main.c
index 7e8e58fb5..5d15253d2 100644
--- a/components/help/hyperbola-main.c
+++ b/components/help/hyperbola-main.c
@@ -26,7 +26,7 @@
#include <eel/eel-debug.h>
#include <gnome.h>
#include <libnautilus-private/nautilus-global-preferences.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include "hyperbola-nav.h"
@@ -94,9 +94,9 @@ 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 ("hyperbola", VERSION, argc, argv);
@@ -104,10 +104,10 @@ main (int argc, char *argv[])
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
- nautilus_global_preferences_initialize ();
+ nautilus_global_preferences_init ();
registration_id =
- oaf_make_registration_id
+ bonobo_activation_make_registration_id
("OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb",
g_getenv ("DISPLAY"));
factory =
diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c
index ea8e607ee..4cad63281 100644
--- a/components/help/hyperbola-nav-tree.c
+++ b/components/help/hyperbola-nav-tree.c
@@ -3,7 +3,6 @@
#include "hyperbola-filefmt.h"
#include <gtk/gtk.h>
#include <gtk/gtkctree.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libnautilus-private/nautilus-theme.h>
@@ -80,7 +79,7 @@ ensure_pixmap_and_mask (GdkPixmap **pixmap, GdkBitmap **mask, const char *name)
return;
}
- pixbuf = gdk_pixbuf_new_from_file (fullname);
+ pixbuf = gdk_pixbuf_new_from_file (fullname, NULL);
if (pixbuf == NULL) {
return;
}
diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index 41ce44ae6..4323462e2 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.c
@@ -63,8 +63,8 @@ typedef struct {
#define HISTORY_VIEW_COLUMN_COUNT 2
static GtkType nautilus_history_view_get_type (void);
-static void nautilus_history_view_initialize_class (NautilusHistoryViewClass *klass);
-static void nautilus_history_view_initialize (NautilusHistoryView *view);
+static void nautilus_history_view_class_init (NautilusHistoryViewClass *klass);
+static void nautilus_history_view_init (NautilusHistoryView *view);
static void nautilus_history_view_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusHistoryView,
@@ -265,7 +265,7 @@ history_changed_callback (NautilusHistoryView *view,
}
static void
-nautilus_history_view_initialize_class (NautilusHistoryViewClass *klass)
+nautilus_history_view_class_init (NautilusHistoryViewClass *klass)
{
GtkObjectClass *object_class;
@@ -275,7 +275,7 @@ nautilus_history_view_initialize_class (NautilusHistoryViewClass *klass)
}
static void
-nautilus_history_view_initialize (NautilusHistoryView *view)
+nautilus_history_view_init (NautilusHistoryView *view)
{
GtkCList *list;
GtkWidget *window;
@@ -350,6 +350,6 @@ main (int argc, char *argv[])
FACTORY_IID,
VIEW_IID,
nautilus_view_create_from_get_type_function,
- nautilus_global_preferences_initialize,
+ nautilus_global_preferences_init,
nautilus_history_view_get_type);
}
diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c
index e9051e8f0..765203a59 100644
--- a/components/image-viewer/nautilus-image-view.c
+++ b/components/image-viewer/nautilus-image-view.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include <gnome.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include <bonobo.h>
@@ -775,7 +775,7 @@ scrollable_control_factory (void)
}
static BonoboObject *
-bonobo_object_factory (BonoboGenericFactory *this, const char *oaf_iid,
+bonobo_object_factory (BonoboGenericFactory *this, const char *bonobo_activation_iid,
void *data)
{
bonobo_object_data_t *bod;
@@ -786,9 +786,9 @@ bonobo_object_factory (BonoboGenericFactory *this, const char *oaf_iid,
* Creates the BonoboObject server
*/
- if (strcmp (oaf_iid, "OAFIID:nautilus-image-generic:6ed7ef0d-9274-4132-9a27-9f048142782f") == 0) {
+ if (strcmp (bonobo_activation_iid, "OAFIID:nautilus-image-generic:6ed7ef0d-9274-4132-9a27-9f048142782f") == 0) {
bod = scaled_control_factory ();
- } else if (strcmp (oaf_iid, "OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd") == 0) {
+ } else if (strcmp (bonobo_activation_iid, "OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd") == 0) {
bod = scrollable_control_factory ();
} else {
return NULL;
@@ -806,7 +806,7 @@ init_bonobo_image_generic_factory (void)
{
char *registration_id;
- registration_id = oaf_make_registration_id ("OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6",
+ registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6",
g_getenv ("DISPLAY"));
image_factory = bonobo_generic_factory_new_multi
@@ -825,8 +825,8 @@ init_server_factory (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 ());
- 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 ("bonobo-image-generic", VERSION,
argc, argv);
diff --git a/components/loser/content/main.c b/components/loser/content/main.c
index 6b4a28ab0..392846dfa 100644
--- a/components/loser/content/main.c
+++ b/components/loser/content/main.c
@@ -28,7 +28,7 @@
#include "nautilus-content-loser.h"
#include <gnome.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include <bonobo.h>
static int object_count = 0;
@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
nautilus_content_loser_maybe_fail ("pre-init");
- 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-content-loser", VERSION,
argc, argv);
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
nautilus_content_loser_maybe_fail ("post-init");
- registration_id = oaf_make_registration_id ("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69", getenv ("DISPLAY"));
+ registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69", getenv ("DISPLAY"));
factory = bonobo_generic_factory_new_multi (registration_id,
loser_make_object,
NULL);
diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c
index 9d22e1eb0..78a651f9b 100644
--- a/components/loser/content/nautilus-content-loser.c
+++ b/components/loser/content/nautilus-content-loser.c
@@ -32,7 +32,7 @@
#include <gtk/gtksignal.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libnautilus/nautilus-bonobo-ui.h>
#include <eel/eel-gtk-macros.h>
#include <stdio.h>
@@ -43,8 +43,8 @@ struct NautilusContentLoserDetails {
NautilusView *nautilus_view;
};
-static void nautilus_content_loser_initialize_class (NautilusContentLoserClass *klass);
-static void nautilus_content_loser_initialize (NautilusContentLoser *view);
+static void nautilus_content_loser_class_init (NautilusContentLoserClass *klass);
+static void nautilus_content_loser_init (NautilusContentLoser *view);
static void nautilus_content_loser_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
@@ -59,7 +59,7 @@ static void nautilus_content_loser_fail (void);
static void ensure_fail_env (void);
static void
-nautilus_content_loser_initialize_class (NautilusContentLoserClass *klass)
+nautilus_content_loser_class_init (NautilusContentLoserClass *klass)
{
GtkObjectClass *object_class;
@@ -69,7 +69,7 @@ nautilus_content_loser_initialize_class (NautilusContentLoserClass *klass)
}
static void
-nautilus_content_loser_initialize (NautilusContentLoser *view)
+nautilus_content_loser_init (NautilusContentLoser *view)
{
view->details = g_new0 (NautilusContentLoserDetails, 1);
diff --git a/components/loser/sidebar/main.c b/components/loser/sidebar/main.c
index c71e6609d..99ab0effe 100644
--- a/components/loser/sidebar/main.c
+++ b/components/loser/sidebar/main.c
@@ -28,7 +28,7 @@
#include "nautilus-sidebar-loser.h"
#include <gnome.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include <bonobo.h>
static int object_count = 0;
@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
nautilus_sidebar_loser_maybe_fail ("pre-init");
- 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-sidebar-loser", VERSION,
argc, argv);
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
nautilus_sidebar_loser_maybe_fail ("post-init");
- registration_id = oaf_make_registration_id ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", getenv ("DISPLAY"));
+ registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", getenv ("DISPLAY"));
factory = bonobo_generic_factory_new_multi (registration_id,
loser_make_object,
NULL);
diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c
index a10d6ca21..217e08433 100644
--- a/components/loser/sidebar/nautilus-sidebar-loser.c
+++ b/components/loser/sidebar/nautilus-sidebar-loser.c
@@ -32,7 +32,7 @@
#include <gtk/gtksignal.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libnautilus/nautilus-bonobo-ui.h>
#include <eel/eel-gtk-macros.h>
#include <stdio.h>
@@ -45,8 +45,8 @@ struct NautilusSidebarLoserDetails {
NautilusView *nautilus_view;
};
-static void nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *klass);
-static void nautilus_sidebar_loser_initialize (NautilusSidebarLoser *view);
+static void nautilus_sidebar_loser_class_init (NautilusSidebarLoserClass *klass);
+static void nautilus_sidebar_loser_init (NautilusSidebarLoser *view);
static void nautilus_sidebar_loser_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
@@ -61,7 +61,7 @@ static void nautilus_sidebar_loser_fail (void);
static void ensure_fail_env (void);
static void
-nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *klass)
+nautilus_sidebar_loser_class_init (NautilusSidebarLoserClass *klass)
{
GtkObjectClass *object_class;
@@ -71,7 +71,7 @@ nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *klass)
}
static void
-nautilus_sidebar_loser_initialize (NautilusSidebarLoser *view)
+nautilus_sidebar_loser_init (NautilusSidebarLoser *view)
{
view->details = g_new0 (NautilusSidebarLoserDetails, 1);
diff --git a/components/mozilla/bonobo-extensions.c b/components/mozilla/bonobo-extensions.c
index c419e499b..c996307e9 100644
--- a/components/mozilla/bonobo-extensions.c
+++ b/components/mozilla/bonobo-extensions.c
@@ -496,7 +496,7 @@ activation_cancel (NautilusBonoboActivationHandle *handle)
}
static void
-oaf_activation_callback (Bonobo_Unknown activated_object,
+bonobo_activation_activation_callback (Bonobo_Unknown activated_object,
const char *error_reason,
gpointer callback_data)
{
@@ -539,8 +539,8 @@ nautilus_bonobo_activate_from_id (const char *iid,
handle->callback = callback;
handle->callback_data = callback_data;
- oaf_activate_from_id_async ((char *) iid, 0,
- oaf_activation_callback,
+ bonobo_activation_activate_from_id_async ((char *) iid, 0,
+ bonobo_activation_activation_callback,
handle, NULL);
if (handle != NULL) {
diff --git a/components/mozilla/main.c b/components/mozilla/main.c
index 2478f34fa..8a3b4e425 100644
--- a/components/mozilla/main.c
+++ b/components/mozilla/main.c
@@ -163,7 +163,7 @@ get_mozilla_path (void)
"/usr/lib/mozilla-0.8.1" /* lame, but helpful for finding Ximian package */
};
- for (i = 0; i < EEL_N_ELEMENTS (paths); i++) {
+ for (i = 0; i < G_N_ELEMENTS (paths); i++) {
if (is_good_mozilla_path (paths[i])) {
return g_strdup (paths[i]);
}
@@ -215,8 +215,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-mozilla-content-view", VERSION,
argc, argv);
@@ -238,7 +238,7 @@ main (int argc, char *argv[])
g_warning ("Couldn't init gconf");
}
- registration_id = oaf_make_registration_id ("OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b", getenv ("DISPLAY"));
+ registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b", getenv ("DISPLAY"));
factory = bonobo_generic_factory_new_multi (registration_id,
mozilla_make_object,
NULL);
diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index b671cfba6..44ac95b60 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -49,7 +49,7 @@
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog-util.h>
#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomevfs/gnome-vfs.h>
#include <stdlib.h>
@@ -118,8 +118,8 @@ typedef struct NautilusMozillaContentViewChrome {
} NautilusMozillaContentViewChrome;
/* GTK Type System */
-static void nautilus_mozilla_content_view_initialize_class (NautilusMozillaContentViewClass *klass);
-static void nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view);
+static void nautilus_mozilla_content_view_class_init (NautilusMozillaContentViewClass *klass);
+static void nautilus_mozilla_content_view_init (NautilusMozillaContentView *view);
static void nautilus_mozilla_content_view_destroy (GtkObject *object);
@@ -234,8 +234,8 @@ static gint string_list_get_index_of_string (const char *string_list[],
guint num_strings,
const char *string);
-static void pre_widget_initialize (void);
-static void post_widget_initialize (void);
+static void pre_widget_init (void);
+static void post_widget_init (void);
/* BonoboControl callbacks */
static void bonobo_control_activate_callback (BonoboObject *control, gboolean state, gpointer callback_data);
@@ -248,7 +248,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusMozillaContentView,
GTK_TYPE_VBOX);
static void
-nautilus_mozilla_content_view_initialize_class (NautilusMozillaContentViewClass *klass)
+nautilus_mozilla_content_view_class_init (NautilusMozillaContentViewClass *klass)
{
GtkObjectClass *object_class;
@@ -256,7 +256,7 @@ nautilus_mozilla_content_view_initialize_class (NautilusMozillaContentViewClass
object_class->destroy = nautilus_mozilla_content_view_destroy;
- pre_widget_initialize ();
+ pre_widget_init ();
}
@@ -305,7 +305,7 @@ set_bonobo_properties (BonoboPropertyBag *bag,
}
static void
-nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view)
+nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
{
view->details = g_new0 (NautilusMozillaContentViewDetails, 1);
@@ -319,7 +319,7 @@ nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view)
* created, otherwise the mozilla runtime environment is not properly
* setup.
*/
- post_widget_initialize ();
+ post_widget_init ();
/* Add callbacks to the beast */
gtk_signal_connect (GTK_OBJECT (view->details->mozilla),
@@ -1858,7 +1858,7 @@ should_uri_navigate_bypass_nautilus (const char *uri)
g_return_val_if_fail (uri != NULL, FALSE);
- return string_list_get_index_of_string (handled_by_nautilus, EEL_N_ELEMENTS (handled_by_nautilus),
+ return string_list_get_index_of_string (handled_by_nautilus, G_N_ELEMENTS (handled_by_nautilus),
uri) != STRING_LIST_NOT_FOUND;
}
@@ -1875,7 +1875,7 @@ should_mozilla_load_uri_directly (const char *uri)
"eazel-services"
};
- return string_list_get_index_of_string (handled_by_mozilla, EEL_N_ELEMENTS (handled_by_mozilla),
+ return string_list_get_index_of_string (handled_by_mozilla, G_N_ELEMENTS (handled_by_mozilla),
uri) != STRING_LIST_NOT_FOUND;
}
@@ -1913,7 +1913,7 @@ string_list_get_index_of_string (const char *string_list[], guint num_strings, c
*/
static void
-pre_widget_initialize (void)
+pre_widget_init (void)
{
const char *profile_directory_name = "MozillaProfile";
char *profile_base_path;
@@ -1945,7 +1945,7 @@ pre_widget_initialize (void)
* is created
*/
static void
-post_widget_initialize (void)
+post_widget_init (void)
{
static gboolean once = FALSE;
char *cache_dir;
diff --git a/components/mozilla/nautilus-mozilla-encoding-tables.c b/components/mozilla/nautilus-mozilla-encoding-tables.c
index f3668fac0..44d312a13 100644
--- a/components/mozilla/nautilus-mozilla-encoding-tables.c
+++ b/components/mozilla/nautilus-mozilla-encoding-tables.c
@@ -29,7 +29,6 @@
#include <config.h>
#include "nautilus-mozilla-encoding-tables.h"
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <string.h>
diff --git a/components/music/main.c b/components/music/main.c
index 9bb75d1e5..fe05c9f9d 100644
--- a/components/music/main.c
+++ b/components/music/main.c
@@ -54,6 +54,6 @@ main (int argc, char *argv[])
FACTORY_IID,
VIEW_IID,
nautilus_view_create_from_get_type_function,
- nautilus_global_preferences_initialize,
+ nautilus_global_preferences_init,
nautilus_music_view_get_type);
}
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index 2bbf25216..b2695bc32 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -184,8 +184,8 @@ static void nautilus_music_view_drag_data_received (GtkWidget
guint info,
guint time,
gpointer user_data);
-static void nautilus_music_view_initialize_class (NautilusMusicViewClass *klass);
-static void nautilus_music_view_initialize (NautilusMusicView *view);
+static void nautilus_music_view_class_init (NautilusMusicViewClass *klass);
+static void nautilus_music_view_init (NautilusMusicView *view);
static void nautilus_music_view_destroy (GtkObject *object);
static void nautilus_music_view_update (NautilusMusicView *music_view);
static void music_view_background_appearance_changed_callback (EelBackground *background,
@@ -231,7 +231,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusMusicView,
NAUTILUS_TYPE_VIEW)
static void
-nautilus_music_view_initialize_class (NautilusMusicViewClass *klass)
+nautilus_music_view_class_init (NautilusMusicViewClass *klass)
{
GtkObjectClass *object_class;
@@ -270,7 +270,7 @@ get_cell_text (GtkWidget *widget, int column_index, int cell_width,
/* initialize ourselves by connecting to the location change signal and allocating our subviews */
static void
-nautilus_music_view_initialize (NautilusMusicView *music_view)
+nautilus_music_view_init (NautilusMusicView *music_view)
{
GtkWidget *label;
GtkWidget *button;
@@ -328,12 +328,12 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->album_title, FALSE, FALSE, 0);
/* Localize the titles */
- for (i = 0; i < EEL_N_ELEMENTS (titles); i++) {
+ for (i = 0; i < G_N_ELEMENTS (titles); i++) {
titles[i] = _(titles[i]);
}
/* allocate a list widget to hold the song list */
- music_view->details->song_list = eel_list_new_with_titles (EEL_N_ELEMENTS (titles), (const char * const *) titles);
+ music_view->details->song_list = eel_list_new_with_titles (G_N_ELEMENTS (titles), (const char * const *) titles);
EEL_CLIST_SET_FLAG (EEL_CLIST (music_view->details->song_list), CLIST_SHOW_TITLES);
@@ -403,7 +403,7 @@ eel_clist_set_column_width (EEL_CLIST (music_view->details->song_list), BITRATE,
/* prepare ourselves to receive dropped objects */
gtk_drag_dest_set (GTK_WIDGET (music_view->details->event_box),
GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
- music_dnd_target_table, EEL_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
+ music_dnd_target_table, G_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
music_view->details->player_state = PLAYER_STOPPED;
@@ -1700,7 +1700,7 @@ nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *
if (image_path_uri != NULL) {
image_path = gnome_vfs_get_local_path_from_uri (image_path_uri);
- pixbuf = gdk_pixbuf_new_from_file (image_path);
+ pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
if (pixbuf != NULL) {
scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c
index 30fb68627..3677e7514 100644
--- a/components/news/nautilus-news.c
+++ b/components/news/nautilus-news.c
@@ -37,7 +37,6 @@
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
@@ -1178,7 +1177,7 @@ extract_items (RSSChannelData *channel_data, xmlNodePtr container_node)
char *title, *temp_str;
gboolean scripting_news_format;
- current_node = container_node->childs;
+ current_node = container_node->children;
item_count = 0;
while (current_node != NULL) {
if (eel_strcmp (current_node->name, "item") == 0) {
@@ -1495,7 +1494,7 @@ rss_read_done_callback (GnomeVFSResult result,
/* flag the update time */
time (&channel_data->last_update);
- /* Parse the rss file with gnome-xml. The gnome-xml parser requires a zero-terminated array. */
+ /* Parse the rss file with libxml. The libxml parser requires a zero-terminated array. */
buffer = g_realloc (file_contents, file_size + 1);
buffer[file_size] = '\0';
rss_document = xmlParseMemory (buffer, file_size);
@@ -1618,7 +1617,7 @@ nautilus_news_add_channels (News *news_data, xmlDocPtr channels)
/* walk through the children of the root object, generating new channel
* objects and adding them to the channel list
*/
- current_channel = xmlDocGetRootElement (channels)->childs;
+ current_channel = xmlDocGetRootElement (channels)->children;
while (current_channel != NULL) {
if (eel_strcmp (current_channel->name, "rss_channel") == 0) {
name = xmlGetProp (current_channel, "name");
@@ -1762,7 +1761,7 @@ nautilus_news_load_images (News *news_data)
news_bullet_path = nautilus_theme_get_image_path ("news_bullet.png");
if (news_bullet_path != NULL) {
- news_data->bullet = gdk_pixbuf_new_from_file (news_bullet_path);
+ news_data->bullet = gdk_pixbuf_new_from_file (news_bullet_path, NULL);
g_free (news_bullet_path);
}
@@ -1772,7 +1771,7 @@ nautilus_news_load_images (News *news_data)
news_bullet_path = nautilus_theme_get_image_path ("changed_bullet.png");
if (news_bullet_path != NULL) {
- news_data->changed_bullet = gdk_pixbuf_new_from_file (news_bullet_path);
+ news_data->changed_bullet = gdk_pixbuf_new_from_file (news_bullet_path, NULL);
g_free (news_bullet_path);
}
@@ -2162,7 +2161,7 @@ add_channels_to_lists (News* news_data)
/* loop through the channel entries, adding an entry to the configure
* list for each entry in the file
*/
- current_channel = xmlDocGetRootElement (channel_doc)->childs;
+ current_channel = xmlDocGetRootElement (channel_doc)->children;
channel_index = 0;
while (current_channel != NULL) {
if (eel_strcmp (current_channel->name, "rss_channel") == 0) {
@@ -2544,6 +2543,6 @@ main(int argc, char *argv[])
"OAFIID:nautilus_news_view_factory:041601",
"OAFIID:nautilus_news_view:041601",
make_news_view,
- nautilus_global_preferences_initialize,
+ nautilus_global_preferences_init,
NULL);
}
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index fc826037b..8b6684484 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -436,6 +436,6 @@ main(int argc, char *argv[])
"OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
"OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185",
make_notes_view,
- nautilus_global_preferences_initialize,
+ nautilus_global_preferences_init,
NULL);
}
diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c
index 41b5c2bca..d00bb31c4 100644
--- a/components/sample/nautilus-sample-content-view.c
+++ b/components/sample/nautilus-sample-content-view.c
@@ -45,7 +45,7 @@
#include <libnautilus/nautilus-bonobo-ui.h>
#include <bonobo/bonobo-control.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtklabel.h>
#include <gtk/gtksignal.h>
@@ -58,8 +58,8 @@ struct NautilusSampleContentViewDetails {
GtkWidget *label;
};
-static void nautilus_sample_content_view_initialize_class (NautilusSampleContentViewClass *klass);
-static void nautilus_sample_content_view_initialize (NautilusSampleContentView *view);
+static void nautilus_sample_content_view_class_init (NautilusSampleContentViewClass *klass);
+static void nautilus_sample_content_view_init (NautilusSampleContentView *view);
static void nautilus_sample_content_view_destroy (GtkObject *object);
static void sample_load_location_callback (NautilusView *nautilus_view,
const char *location,
@@ -95,8 +95,8 @@ nautilus_sample_content_view_get_type (void)
"NautilusSampleContentView",
sizeof (NautilusSampleContentView),
sizeof (NautilusSampleContentViewClass),
- (GtkClassInitFunc)nautilus_sample_content_view_initialize_class,
- (GtkObjectInitFunc)nautilus_sample_content_view_initialize,
+ (GtkClassInitFunc)nautilus_sample_content_view_class_init,
+ (GtkObjectInitFunc)nautilus_sample_content_view_init,
NULL,
NULL,
NULL
@@ -115,7 +115,7 @@ nautilus_sample_content_view_get_type (void)
static void
-nautilus_sample_content_view_initialize_class (NautilusSampleContentViewClass *klass)
+nautilus_sample_content_view_class_init (NautilusSampleContentViewClass *klass)
{
GtkObjectClass *object_class;
@@ -127,7 +127,7 @@ nautilus_sample_content_view_initialize_class (NautilusSampleContentViewClass *k
}
static void
-nautilus_sample_content_view_initialize (NautilusSampleContentView *view)
+nautilus_sample_content_view_init (NautilusSampleContentView *view)
{
g_assert (NAUTILUS_IS_SAMPLE_CONTENT_VIEW (view));
diff --git a/components/shell/shell.c b/components/shell/shell.c
index 0c9c5e1cf..9de44a090 100644
--- a/components/shell/shell.c
+++ b/components/shell/shell.c
@@ -1,11 +1,11 @@
#include <errno.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include <gnome.h>
#include <bonobo.h>
#include <zvt/zvtterm.h>
#include <popt.h>
-extern struct poptOption oaf_popt_options[];
+extern struct poptOption bonobo_activation_popt_options[];
static BonoboObject *
shell_factory (BonoboGenericFactory *Factory, void *closure)
@@ -39,7 +39,7 @@ shell_factory_init (void)
if (xterm_factory != NULL)
return;
- registration_id = oaf_make_registration_id (, g_getenv ("DISPLAY"));
+ registration_id = bonobo_activation_make_registration_id (, g_getenv ("DISPLAY"));
factory = bonobo_generic_factory_new_multi "OAFIID:shell_factory:10a7d344-c4cd-402f-9e05-bd591bbc5618", shell_factory, NULL);
g_free (registration_id);
@@ -57,8 +57,8 @@ init_bonobo (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_with_popt_table ("xterm-control-factory", "0.0",
argc, argv);
diff --git a/components/text/main.c b/components/text/main.c
index 4ffc29302..ecea056d7 100644
--- a/components/text/main.c
+++ b/components/text/main.c
@@ -54,6 +54,6 @@ main (int argc, char *argv[])
FACTORY_IID,
VIEW_IID,
nautilus_view_create_from_get_type_function,
- nautilus_global_preferences_initialize,
+ nautilus_global_preferences_init,
nautilus_text_view_get_type);
}
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index 645f593b1..7c4e859cc 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -88,8 +88,8 @@ typedef struct {
char *source_mode;
} ServiceMenuItemParameters;
-static void nautilus_text_view_initialize_class (NautilusTextViewClass *klass);
-static void nautilus_text_view_initialize (NautilusTextView *view);
+static void nautilus_text_view_class_init (NautilusTextViewClass *klass);
+static void nautilus_text_view_init (NautilusTextView *view);
static void nautilus_text_view_destroy (GtkObject *object);
static void nautilus_text_view_update (NautilusTextView *text_view);
static void text_view_load_location_callback (NautilusView *view,
@@ -125,7 +125,7 @@ static const int max_preferred_zoom_levels = (sizeof (text_view_preferred_zoom_l
sizeof (float)) - 1;
static void
-nautilus_text_view_initialize_class (NautilusTextViewClass *klass)
+nautilus_text_view_class_init (NautilusTextViewClass *klass)
{
GtkObjectClass *object_class;
@@ -145,7 +145,7 @@ nautilus_text_view_initialize_class (NautilusTextViewClass *klass)
/* initialize ourselves by connecting to the location change signal and allocating our subviews */
static void
-nautilus_text_view_initialize (NautilusTextView *text_view)
+nautilus_text_view_init (NautilusTextView *text_view)
{
GtkWidget *scrolled_window;
@@ -171,7 +171,7 @@ nautilus_text_view_initialize (NautilusTextView *text_view)
bonobo_zoomable_set_parameters_full (text_view->details->zoomable,
1.0, .25, 4.0, TRUE, TRUE, FALSE,
text_view_preferred_zoom_levels, NULL,
- EEL_N_ELEMENTS (text_view_preferred_zoom_levels));
+ G_N_ELEMENTS (text_view_preferred_zoom_levels));
bonobo_object_add_interface (BONOBO_OBJECT (text_view),
BONOBO_OBJECT (text_view->details->zoomable));
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,
diff --git a/components/tree/libmain.c b/components/tree/libmain.c
index 39bf34263..33add833d 100644
--- a/components/tree/libmain.c
+++ b/components/tree/libmain.c
@@ -29,14 +29,14 @@
#include "nautilus-tree-view-iids.h"
#include "nautilus-tree-view.h"
#include <bonobo.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
-/* FIXME bugzilla.gnome.org 42736: oaf_plugin_unuse can't possibly work! this sucks */
+/* FIXME bugzilla.gnome.org 42736: bonobo_activation_plugin_unuse can't possibly work! this sucks */
#if 0
static void
tree_shlib_object_destroyed (GtkObject *object)
{
- oaf_plugin_unuse (gtk_object_get_user_data (object));
+ bonobo_activation_plugin_unuse (gtk_object_get_user_data (object));
}
#endif
@@ -58,7 +58,7 @@ tree_shlib_make_object (PortableServer_POA poa,
gtk_signal_connect (GTK_OBJECT (view), "destroy", tree_shlib_object_destroyed, NULL);
#endif
- oaf_plugin_use (poa, impl_ptr);
+ bonobo_activation_plugin_use (poa, impl_ptr);
return CORBA_Object_duplicate (bonobo_object_corba_objref
(BONOBO_OBJECT (view)), ev);
diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c
index 4a692d130..91c2005c9 100644
--- a/components/tree/nautilus-tree-change-queue.c
+++ b/components/tree/nautilus-tree-change-queue.c
@@ -37,9 +37,9 @@ struct NautilusTreeChangeQueueDetails {
static void nautilus_tree_change_queue_destroy (GtkObject *object);
-static void nautilus_tree_change_queue_initialize (gpointer object,
+static void nautilus_tree_change_queue_init (gpointer object,
gpointer klass);
-static void nautilus_tree_change_queue_initialize_class (gpointer klass);
+static void nautilus_tree_change_queue_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
@@ -51,7 +51,7 @@ static NautilusTreeChange *nautilus_tree_change_new (NautilusTreeChangeType
/* type system infrastructure code */
static void
-nautilus_tree_change_queue_initialize_class (gpointer klass)
+nautilus_tree_change_queue_class_init (gpointer klass)
{
GtkObjectClass *object_class;
@@ -62,7 +62,7 @@ nautilus_tree_change_queue_initialize_class (gpointer klass)
}
static void
-nautilus_tree_change_queue_initialize (gpointer object,
+nautilus_tree_change_queue_init (gpointer object,
gpointer klass)
{
NautilusTreeChangeQueue *change_queue;
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index b7f073d3e..402f82f02 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -37,9 +37,9 @@ struct NautilusTreeExpansionStateDetails {
};
static void nautilus_tree_expansion_state_destroy (GtkObject *object);
-static void nautilus_tree_expansion_state_initialize (gpointer object,
+static void nautilus_tree_expansion_state_init (gpointer object,
gpointer klass);
-static void nautilus_tree_expansion_state_initialize_class (gpointer klass);
+static void nautilus_tree_expansion_state_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
@@ -56,7 +56,7 @@ static void nautilus_tree_expansion_state_expand_node_internal (Nautil
/* infrastructure stuff */
static void
-nautilus_tree_expansion_state_initialize_class (gpointer klass)
+nautilus_tree_expansion_state_class_init (gpointer klass)
{
GtkObjectClass *object_class;
@@ -130,7 +130,7 @@ nautilus_tree_expansion_state_save_to_preferences (NautilusTreeExpansionState *e
}
static void
-nautilus_tree_expansion_state_initialize (gpointer object, gpointer klass)
+nautilus_tree_expansion_state_init (gpointer object, gpointer klass)
{
NautilusTreeExpansionState *expansion_state;
diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c
index db051c7d9..728517478 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/components/tree/nautilus-tree-model.c
@@ -65,9 +65,9 @@ struct NautilusTreeModelDetails {
static void nautilus_tree_model_destroy (GtkObject *object);
-static void nautilus_tree_model_initialize (gpointer object,
+static void nautilus_tree_model_init (gpointer object,
gpointer klass);
-static void nautilus_tree_model_initialize_class (gpointer klass);
+static void nautilus_tree_model_class_init (gpointer klass);
static void remove_all_nodes (NautilusTreeModel *model);
static void nautilus_tree_model_set_root_uri (NautilusTreeModel *model,
const char *root_uri);
@@ -98,7 +98,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_O
/* infrastructure stuff */
static void
-nautilus_tree_model_initialize_class (gpointer klass)
+nautilus_tree_model_class_init (gpointer klass)
{
GtkObjectClass *object_class;
@@ -107,43 +107,44 @@ nautilus_tree_model_initialize_class (gpointer klass)
object_class->destroy = nautilus_tree_model_destroy;
signals[NODE_CHANGED] =
- gtk_signal_new ("node_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusTreeModelClass, node_changed),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_signal_new ("node_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusTreeModelClass, node_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[NODE_REMOVED] =
- gtk_signal_new ("node_removed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusTreeModelClass, node_removed),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_signal_new ("node_removed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusTreeModelClass, node_removed),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[NODE_BEING_RENAMED] =
- gtk_signal_new ("node_being_renamed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusTreeModelClass, node_removed),
- gtk_marshal_NONE__POINTER_POINTER,
- GTK_TYPE_NONE, 2, GTK_TYPE_STRING, GTK_TYPE_STRING);
+ g_signal_new ("node_being_renamed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusTreeModelClass, node_removed),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER_POINTER,
+ G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
signals[DONE_LOADING_CHILDREN] =
- gtk_signal_new ("done_loading_children",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusTreeModelClass, done_loading_children),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ g_signal_new ("done_loading_children",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusTreeModelClass, done_loading_children),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
}
static void
-nautilus_tree_model_initialize (gpointer object, gpointer klass)
+nautilus_tree_model_init (gpointer object, gpointer klass)
{
NautilusTreeModel *model;
diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c
index f2a3a5520..0c7f361bb 100644
--- a/components/tree/nautilus-tree-node.c
+++ b/components/tree/nautilus-tree-node.c
@@ -33,9 +33,9 @@
static void nautilus_tree_node_destroy (GtkObject *object);
-static void nautilus_tree_node_initialize (gpointer object,
+static void nautilus_tree_node_init (gpointer object,
gpointer klass);
-static void nautilus_tree_node_initialize_class (gpointer klass);
+static void nautilus_tree_node_class_init (gpointer klass);
@@ -43,7 +43,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJ
static void
-nautilus_tree_node_initialize_class (gpointer klass)
+nautilus_tree_node_class_init (gpointer klass)
{
GtkObjectClass *object_class;
@@ -53,7 +53,7 @@ nautilus_tree_node_initialize_class (gpointer klass)
}
static void
-nautilus_tree_node_initialize (gpointer object, gpointer klass)
+nautilus_tree_node_init (gpointer object, gpointer klass)
{
NautilusTreeNode *node;
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index 798a46fbf..5e415da02 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -196,14 +196,14 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view)
view->details->dnd->drag_info = g_new0 (EelDragInfo, 1);
eel_drag_init (view->details->dnd->drag_info,
nautilus_tree_view_dnd_target_table,
- EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+ G_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
NULL);
gtk_drag_dest_set (GTK_WIDGET (view->details->tree),
0,
nautilus_tree_view_dnd_target_table,
- EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+ G_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
GDK_ACTION_COPY
| GDK_ACTION_MOVE
| GDK_ACTION_LINK
@@ -395,7 +395,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
if (nautilus_tree_view_dnd_target_list == NULL)
nautilus_tree_view_dnd_target_list = gtk_target_list_new (nautilus_tree_view_dnd_target_table,
- EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
+ G_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
for (target = context->targets; target != NULL; target = target->next) {
guint dummy_info;
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index e3499a691..52ceb28ed 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -83,8 +83,8 @@ static void nautilus_tree_view_update_all_icons (NautilusTreeView *vie
static void cancel_possible_activation (NautilusTreeView *view);
static void nautilus_tree_view_update_model_node (NautilusTreeView *view,
NautilusTreeNode *node);
-static void nautilus_tree_view_initialize_class (NautilusTreeViewClass *klass);
-static void nautilus_tree_view_initialize (NautilusTreeView *view);
+static void nautilus_tree_view_class_init (NautilusTreeViewClass *klass);
+static void nautilus_tree_view_init (NautilusTreeView *view);
static void register_unparented_node (NautilusTreeView *view,
NautilusTreeNode *node);
static void forget_unparented_node (NautilusTreeView *view,
@@ -1031,7 +1031,7 @@ tree_unmap_callback (GtkWidget *widget,
}
static void
-nautilus_tree_view_initialize (NautilusTreeView *view)
+nautilus_tree_view_init (NautilusTreeView *view)
{
view->details = g_new0 (NautilusTreeViewDetails, 1);
@@ -1619,7 +1619,7 @@ nautilus_tree_view_update_all_icons (NautilusTreeView *view)
}
static void
-nautilus_tree_view_initialize_class (NautilusTreeViewClass *klass)
+nautilus_tree_view_class_init (NautilusTreeViewClass *klass)
{
GtkObjectClass *object_class;
diff --git a/configure.in b/configure.in
index dfabb5370..06c44b71a 100644
--- a/configure.in
+++ b/configure.in
@@ -87,6 +87,7 @@ LIBNAUTILUS_MODULES="\
glib-2.0 \
gnome-vfs-2.0 \
gtk+-2.0 \
+ libgnomecanvas-2.0 \
libbonobo-2.0 \
libbonoboui-2.0"
LIBNAUTILUS_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`"
@@ -96,7 +97,39 @@ AC_SUBST(LIBNAUTILUS_LIBS)
LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
AC_SUBST(LIBNAUTILUS_IDL_INCLUDES)
+dnl libnautilus-adapter
+LIBNAUTILUS_ADAPTER_MODULES="\
+ bonobo-activation-2.0 \
+ eel-2.0 \
+ glib-2.0 \
+ gnome-vfs-2.0 \
+ gtk+-2.0 \
+ libgnomecanvas-2.0 \
+ libbonobo-2.0 \
+ libbonoboui-2.0"
+LIBNAUTILUS_ADAPTER_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`"
+AC_SUBST(LIBNAUTILUS_ADAPTER_CFLAGS)
+LIBNAUTILUS_ADAPTER_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
+AC_SUBST(LIBNAUTILUS_ADAPTER_LIBS)
+LIBNAUTILUS_ADAPTER_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_ADAPTER_MODULES | $srcdir/add-include-prefix`"
+AC_SUBST(LIBNAUTILUS_ADAPTER_IDL_INCLUDES)
+
dnl libnautilus-private
+LIBNAUTILUS_PRIVATE_MODULES="\
+ bonobo-activation-2.0 \
+ eel-2.0 \
+ glib-2.0 \
+ gnome-vfs-2.0 \
+ gtk+-2.0 \
+ libgnomecanvas-2.0 \
+ libbonobo-2.0 \
+ libbonoboui-2.0"
+LIBNAUTILUS_PRIVATE_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`"
+AC_SUBST(LIBNAUTILUS_PRIVATE_CFLAGS)
+LIBNAUTILUS_PRIVATE_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
+AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS)
+LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`"
+AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES)
dnl ====================================
dnl = Begin profiling support
diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c b/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c
index c954b7888..d36b8d6bc 100644
--- a/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c
+++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c
@@ -177,16 +177,15 @@ gtk_wrap_box_class_init (GtkWrapBoxClass *class)
gtk_container_add_child_arg_type ("GtkWrapBox::forcebreak",
GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_FORCED_BREAK);
- signals[NEED_REALLOCATION] = gtk_signal_new
+ signals[NEED_REALLOCATION] = g_signal_new
("need_reallocation",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (GtkWrapBoxClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkWrapBoxClass,
need_reallocation),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ G_TYPE_NONE, 0);
}
static void
diff --git a/helper-utilities/error-dialog/nautilus-error-dialog.c b/helper-utilities/error-dialog/nautilus-error-dialog.c
index c20be169c..49b91b356 100644
--- a/helper-utilities/error-dialog/nautilus-error-dialog.c
+++ b/helper-utilities/error-dialog/nautilus-error-dialog.c
@@ -56,7 +56,7 @@
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
/*
diff --git a/libnautilus-adapter/Makefile.am b/libnautilus-adapter/Makefile.am
index b8bf85eeb..2d628f018 100644
--- a/libnautilus-adapter/Makefile.am
+++ b/libnautilus-adapter/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES=libnautilus-adapter.la
INCLUDES=\
-I$(top_srcdir) \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(LIBNAUTILUS_ADAPTER_CFLAGS) \
$(NULL)
libnautilus_adapter_la_LDFLAGS= \
@@ -30,8 +30,8 @@ libnautilus_adapter_la_SOURCES = \
$(nautilus_adapter_factory_idl_sources): nautilus_adapter_factory_idl_stamp
nautilus_adapter_factory_idl_stamp: nautilus-adapter-factory.idl
- $(ORBIT_IDL) $(IDL_CFLAGS) $(srcdir)/nautilus-adapter-factory.idl
- touch nautilus_adapter_factory_idl_stamp
+ $(ORBIT_IDL) -I$(top_srcdir) $(LIBNAUTILUS_ADAPTER_IDL_INCLUDES) $<
+ touch $@
CLEANFILES = \
@@ -43,3 +43,4 @@ EXTRA_DIST = \
dist-hook:
cd $(distdir); rm -f $(CLEANFILES)
+
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index ffdf58b5d..5a0461b8c 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -6,10 +6,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/cut-n-paste-code/widgets/e-paned \
- $(NAUTILUS_PRIVATE_CFLAGS) \
- $(ESD_CFLAGS) \
- $(MEDUSA_CFLAGS) \
- $(LIBRSVG_CFLAGS) \
+ $(LIBNAUTILUS_PRIVATE_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
$(NULL)
@@ -27,10 +24,7 @@ endif
libnautilus_private_la_LDFLAGS = \
$(dependency_static_libs) \
- $(ESD_LIBS) \
- $(LIBJPEG) \
- $(MEDUSA_LIBS) \
- $(FAM_LIBS) \
+ $(LIBNAUTILUS_PRIVATE_LIBS) \
$(CDDALIBADD) \
$(NULL)
@@ -55,8 +49,6 @@ libnautilus_private_la_SOURCES = \
nautilus-directory-metafile.c \
nautilus-directory.c \
nautilus-drag-window.c \
- nautilus-druid-page-eazel.c \
- nautilus-druid.c \
nautilus-entry.c \
nautilus-file-changes-queue.c \
nautilus-file-dnd.c \
@@ -184,8 +176,8 @@ $(lib_LTLIBRARIES): $(dependency_static_libs)
$(nautilus_metafile_server_idl_sources): nautilus_metafile_server_idl_stamp
nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL)
- $(ORBIT_IDL) $(IDL_CFLAGS) $(srcdir)/nautilus-metafile-server.idl
- touch nautilus_metafile_server_idl_stamp
+ $(ORBIT_IDL) -I$(top_srcdir) $(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) $<
+ touch $@
$(libnautilus_private_la_OBJECTS): nautilus_metafile_server_idl_stamp
diff --git a/libnautilus-private/nautilus-authn-manager.c b/libnautilus-private/nautilus-authn-manager.c
index 57e5706d8..e40b3011d 100644
--- a/libnautilus-private/nautilus-authn-manager.c
+++ b/libnautilus-private/nautilus-authn-manager.c
@@ -251,7 +251,7 @@ vfs_authentication_callback (gconstpointer in, size_t in_size,
}
void
-nautilus_authentication_manager_initialize (void)
+nautilus_authentication_manager_init (void)
{
callback_cond = g_cond_new ();
callback_mutex = g_mutex_new ();
diff --git a/libnautilus-private/nautilus-authn-manager.h b/libnautilus-private/nautilus-authn-manager.h
index f6c6ff42e..9db9feb7e 100644
--- a/libnautilus-private/nautilus-authn-manager.h
+++ b/libnautilus-private/nautilus-authn-manager.h
@@ -25,6 +25,6 @@
#ifndef NAUTILUS_AUTHN_MANAGER_H
#define NAUTILUS_AUTHN_MANAGER_H
-void nautilus_authentication_manager_initialize (void);
+void nautilus_authentication_manager_init (void);
#endif /* NAUTILUS_AUTHN_MANAGER_H */
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index f4cc80391..1c38ff29a 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -32,7 +32,6 @@
#include <bonobo/bonobo-ui-util.h>
#include <gtk/gtkmain.h>
#include <libgnomevfs/gnome-vfs-utils.h>
-#include <liboaf/oaf-async.h>
struct NautilusBonoboActivationHandle {
NautilusBonoboActivationHandle **early_completion_hook;
@@ -548,7 +547,7 @@ activation_cancel (NautilusBonoboActivationHandle *handle)
}
static void
-oaf_activation_callback (Bonobo_Unknown activated_object,
+bonobo_activation_activation_callback (Bonobo_Unknown activated_object,
const char *error_reason,
gpointer callback_data)
{
@@ -591,8 +590,8 @@ nautilus_bonobo_activate_from_id (const char *iid,
handle->callback = callback;
handle->callback_data = callback_data;
- oaf_activate_from_id_async ((char *) iid, 0,
- oaf_activation_callback,
+ bonobo_activation_activate_from_id_async ((char *) iid, 0,
+ bonobo_activation_activation_callback,
handle, NULL);
if (handle != NULL) {
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 3c16da5fe..48c125761 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -33,9 +33,7 @@
#include <eel/eel-vfs-extensions.h>
#include <gtk/gtkaccellabel.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
-#include <libgnomeui/gtkpixmapmenuitem.h>
#include <libgnomevfs/gnome-vfs-types.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -61,8 +59,8 @@ struct NautilusBookmarkDetails
static void nautilus_bookmark_connect_file (NautilusBookmark *file);
static void nautilus_bookmark_disconnect_file (NautilusBookmark *file);
-static void nautilus_bookmark_initialize_class (NautilusBookmarkClass *class);
-static void nautilus_bookmark_initialize (NautilusBookmark *bookmark);
+static void nautilus_bookmark_class_init (NautilusBookmarkClass *class);
+static void nautilus_bookmark_init (NautilusBookmark *bookmark);
static GtkWidget *create_pixmap_widget_for_bookmark (NautilusBookmark *bookmark);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
@@ -91,7 +89,7 @@ nautilus_bookmark_destroy (GtkObject *object)
/* Initialization. */
static void
-nautilus_bookmark_initialize_class (NautilusBookmarkClass *class)
+nautilus_bookmark_class_init (NautilusBookmarkClass *class)
{
GtkObjectClass *object_class;
@@ -100,27 +98,27 @@ nautilus_bookmark_initialize_class (NautilusBookmarkClass *class)
object_class->destroy = nautilus_bookmark_destroy;
signals[APPEARANCE_CHANGED] =
- gtk_signal_new ("appearance_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusBookmarkClass, appearance_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("appearance_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusBookmarkClass, appearance_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[CONTENTS_CHANGED] =
- gtk_signal_new ("contents_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusBookmarkClass, contents_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ g_signal_new ("contents_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusBookmarkClass, contents_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
}
static void
-nautilus_bookmark_initialize (NautilusBookmark *bookmark)
+nautilus_bookmark_init (NautilusBookmark *bookmark)
{
bookmark->details = g_new0 (NautilusBookmarkDetails, 1);
}
@@ -472,7 +470,7 @@ nautilus_bookmark_disconnect_file (NautilusBookmark *bookmark)
if (bookmark->details->file != NULL) {
gtk_signal_disconnect_by_func (GTK_OBJECT (bookmark->details->file),
- bookmark_file_changed_callback,
+ G_CALLBACK (bookmark_file_changed_callback),
bookmark);
nautilus_file_unref (bookmark->details->file);
bookmark->details->file = NULL;
@@ -499,7 +497,7 @@ nautilus_bookmark_connect_file (NautilusBookmark *bookmark)
gtk_signal_connect (GTK_OBJECT (bookmark->details->file),
"changed",
- bookmark_file_changed_callback,
+ G_CALLBACK (bookmark_file_changed_callback),
bookmark);
}
@@ -572,12 +570,18 @@ nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark)
* user data. For now let's not let them be turn-offable and see if
* anyone objects strenuously.
*/
+#if GNOME2_CONVERSION_COMPLETE
menu_item = gtk_pixmap_menu_item_new ();
+#else
+ menu_item = NULL;
+#endif
pixmap_widget = create_pixmap_widget_for_bookmark (bookmark);
if (pixmap_widget != NULL) {
gtk_widget_show (pixmap_widget);
+#if GNOME2_CONVERSION_COMPLETE
gtk_pixmap_menu_item_set_pixmap (GTK_PIXMAP_MENU_ITEM (menu_item), pixmap_widget);
+#endif
}
display_name = eel_truncate_text_for_menu_item (bookmark->details->name);
label = gtk_label_new (display_name);
diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c
index db3ee6af5..bbd5a2e34 100644
--- a/libnautilus-private/nautilus-customization-data.c
+++ b/libnautilus-private/nautilus-customization-data.c
@@ -28,7 +28,6 @@
#include <config.h>
#include <ctype.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-i18n.h>
@@ -40,7 +39,6 @@
#include <gtk/gtk.h>
#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
-#include <libgnome/gnome-defs.h>
#include <stdlib.h>
#include "nautilus-customization-data.h"
@@ -110,7 +108,7 @@ nautilus_customization_data_new (const char *customization_name,
public_result = gnome_vfs_directory_list_load (&data->public_file_list,
public_directory_uri,
GNOME_VFS_FILE_INFO_GET_MIME_TYPE
- | GNOME_VFS_FILE_INFO_FOLLOW_LINKS, NULL);
+ | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
g_free (public_directory_uri);
}
@@ -118,7 +116,7 @@ nautilus_customization_data_new (const char *customization_name,
private_result = gnome_vfs_directory_list_load (&data->private_file_list,
private_directory_uri,
GNOME_VFS_FILE_INFO_GET_MIME_TYPE
- | GNOME_VFS_FILE_INFO_FOLLOW_LINKS, NULL);
+ | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
g_free (private_directory_uri);
if (public_result != GNOME_VFS_OK &&
private_result != GNOME_VFS_OK) {
@@ -138,7 +136,7 @@ nautilus_customization_data_new (const char *customization_name,
/* load the frame if necessary */
if (!strcmp(customization_name, "patterns")) {
temp_str = nautilus_pixmap_file ("chit_frame.png");
- data->pattern_frame = gdk_pixbuf_new_from_file (temp_str);
+ data->pattern_frame = gdk_pixbuf_new_from_file (temp_str, NULL);
g_free (temp_str);
} else {
data->pattern_frame = NULL;
@@ -208,7 +206,7 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
image_file_name = get_file_path_for_mode (data,
current_file_info->name);
- orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name);
+ orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name, NULL);
g_free (image_file_name);
is_reset_image = eel_strcmp(current_file_info->name, RESET_IMAGE_NAME) == 0;
@@ -266,7 +264,7 @@ nautilus_customization_data_destroy (NautilusCustomizationData *data)
gnome_vfs_file_info_list_free (data->private_file_list);
if (data->name_map_hash != NULL) {
- eel_g_hash_table_destroy_deep (data->name_map_hash);
+ g_hash_table_destroy (data->name_map_hash);
}
g_free (data->customization_name);
@@ -454,7 +452,7 @@ load_name_map_hash_table (NautilusCustomizationData *data)
xmlNodePtr category_node, current_node;
/* allocate the hash table */
- data->name_map_hash = g_hash_table_new (g_str_hash, g_str_equal);
+ data->name_map_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
/* build the path name to the browser.xml file and load it */
xml_path = nautilus_make_path (NAUTILUS_DATADIR, "browser.xml");
@@ -465,14 +463,14 @@ load_name_map_hash_table (NautilusCustomizationData *data)
if (browser_data) {
/* get the category node */
category_node = eel_xml_get_root_child_by_name_and_property (browser_data, "category", "name", data->customization_name);
- current_node = category_node->childs;
+ current_node = category_node->children;
/* loop through the entries, adding a mapping to the hash table */
while (current_node != NULL) {
display_name = eel_xml_get_property_translated (current_node, "display_name");
filename = xmlGetProp (current_node, "filename");
if (display_name && filename) {
- g_hash_table_insert (data->name_map_hash, g_strdup (filename), g_strdup (display_name));
+ g_hash_table_replace (data->name_map_hash, g_strdup (filename), g_strdup (display_name));
}
xmlFree (filename);
xmlFree (display_name);
diff --git a/libnautilus-private/nautilus-desktop-file-loader.c b/libnautilus-private/nautilus-desktop-file-loader.c
index 734afdf9f..2100e8fc4 100644
--- a/libnautilus-private/nautilus-desktop-file-loader.c
+++ b/libnautilus-private/nautilus-desktop-file-loader.c
@@ -1172,7 +1172,7 @@ nautilus_desktop_file_launch (NautilusDesktopFile *df)
nautilus_desktop_file_get_string (df, NULL, "URL", &url);
if (url != NULL) {
- gnome_url_show (url);
+ gnome_url_show (url, NULL);
}
g_free (url);
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 2ac0a4210..22f68093d 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -38,8 +38,6 @@
#include <ctype.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <libgnome/gnome-metadata.h>
-#include <libgnome/gnome-mime-info.h>
#include <gtk/gtkmain.h>
#include <stdlib.h>
#include <stdio.h>
@@ -133,7 +131,7 @@ static void move_file_to_low_priority_queue (NautilusDirectory *directory
static gboolean
istr_equal (gconstpointer v, gconstpointer v2)
{
- return g_strcasecmp (v, v2) == 0;
+ return g_ascii_strcasecmp (v, v2) == 0;
}
static guint
@@ -144,7 +142,7 @@ istr_hash (gconstpointer key)
h = 0;
for (p = key; *p != '\0'; p++) {
- h = (h << 5) - h + tolower ((guchar) *p);
+ h = (h << 5) - h + g_ascii_tolower (*p);
}
return h;
@@ -153,7 +151,7 @@ istr_hash (gconstpointer key)
static GHashTable *
istr_set_new (void)
{
- return g_hash_table_new (istr_hash, istr_equal);
+ return g_hash_table_new_full (istr_hash, istr_equal, g_free, NULL);
}
static void
@@ -161,10 +159,8 @@ istr_set_insert (GHashTable *table, const char *istr)
{
char *key;
- if (g_hash_table_lookup (table, istr) == NULL) {
- key = g_strdup (istr);
- g_hash_table_insert (table, key, key);
- }
+ key = g_strdup (istr);
+ g_hash_table_replace (table, key, key);
}
static void
@@ -189,7 +185,7 @@ istr_set_get_as_list (GHashTable *table)
static void
istr_set_destroy (GHashTable *table)
{
- eel_g_hash_table_destroy_deep (table);
+ g_hash_table_destroy (table);
}
/* Start a job. This is really just a way of limiting the number of
@@ -676,6 +672,8 @@ set_file_unconfirmed (NautilusFile *file, gboolean unconfirmed)
}
}
+#if GNOME2_CONVERSION_COMPLETE
+
static gboolean show_hidden_files = TRUE;
static gboolean show_backup_files = TRUE;
@@ -733,6 +731,8 @@ get_filter_options_for_directory_count (void)
return filter_options;
}
+#endif
+
static void
load_directory_state_destroy (NautilusDirectory *directory)
{
@@ -754,9 +754,6 @@ load_directory_state_destroy (NautilusDirectory *directory)
nautilus_file_unref (file);
}
-
- gnome_vfs_directory_filter_destroy (directory->details->load_file_count_filter);
- directory->details->load_file_count_filter = NULL;
}
static void
@@ -806,10 +803,11 @@ dequeue_pending_idle_callback (gpointer callback_data)
* moving this into the actual callback instead of
* waiting for the idle function.
*/
- if (gnome_vfs_directory_filter_apply (directory->details->load_file_count_filter,
- file_info)) {
- directory->details->load_file_count += 1;
- }
+#if GNOME2_CONVERSION_COMPLETE
+ /* if (gnome_vfs_directory_filter_apply (directory->details->load_file_count_filter,
+ file_info)) */
+#endif
+ directory->details->load_file_count += 1;
/* Add the MIME type to the set. */
if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0
@@ -1434,6 +1432,7 @@ nautilus_directory_get_info_for_new_files (NautilusDirectory *directory,
vfs_uri_list,
(GNOME_VFS_FILE_INFO_GET_MIME_TYPE
| GNOME_VFS_FILE_INFO_FOLLOW_LINKS),
+ GNOME_VFS_PRIORITY_DEFAULT,
new_files_callback,
directory);
@@ -1779,6 +1778,8 @@ mark_all_files_unconfirmed (NautilusDirectory *directory)
}
}
+#if GNOME2_CONVERSION_COMPLETE
+
static gboolean
should_display_file_name (const char *name,
GnomeVFSDirectoryFilterOptions options)
@@ -1842,6 +1843,8 @@ get_file_count_filter (NautilusDirectory *directory)
NULL);
}
+#endif
+
/* Start monitoring the file list if it isn't already. */
static void
start_monitoring_file_list (NautilusDirectory *directory)
@@ -1869,7 +1872,9 @@ start_monitoring_file_list (NautilusDirectory *directory)
directory->details->load_directory_file->details->loading_directory = TRUE;
directory->details->load_file_count = 0;
+#if GNOME2_CONVERSION_COMPLETE
directory->details->load_file_count_filter = get_file_count_filter (directory);
+#endif
directory->details->load_mime_list_hash = istr_set_new ();
#ifdef DEBUG_LOAD_DIRECTORY
g_message ("load_directory called to monitor file list of %s", directory->details->uri);
@@ -1879,11 +1884,8 @@ start_monitoring_file_list (NautilusDirectory *directory)
directory->details->uri, /* uri */
(GNOME_VFS_FILE_INFO_GET_MIME_TYPE /* options */
| GNOME_VFS_FILE_INFO_FOLLOW_LINKS),
- GNOME_VFS_DIRECTORY_FILTER_NONE, /* filter_type */
- (GNOME_VFS_DIRECTORY_FILTER_NOSELFDIR /* filter_options */
- | GNOME_VFS_DIRECTORY_FILTER_NOPARENTDIR),
- NULL, /* filter_pattern */
DIRECTORY_LOAD_ITEMS_PER_CALLBACK, /* items_per_notification */
+ GNOME_VFS_PRIORITY_DEFAULT,
directory_load_callback, /* callback */
directory);
}
@@ -2102,10 +2104,8 @@ directory_count_start (NautilusDirectory *directory,
(&directory->details->count_in_progress,
uri,
GNOME_VFS_FILE_INFO_DEFAULT,
- GNOME_VFS_DIRECTORY_FILTER_NONE,
- get_filter_options_for_directory_count (),
- NULL,
G_MAXINT,
+ GNOME_VFS_PRIORITY_DEFAULT,
directory_count_callback,
directory);
g_free (uri);
@@ -2213,11 +2213,8 @@ deep_count_load (NautilusDirectory *directory, const char *uri)
(&directory->details->deep_count_in_progress,
uri,
GNOME_VFS_FILE_INFO_DEFAULT,
- GNOME_VFS_DIRECTORY_FILTER_NONE,
- (GNOME_VFS_DIRECTORY_FILTER_NOSELFDIR
- | GNOME_VFS_DIRECTORY_FILTER_NOPARENTDIR),
- NULL,
G_MAXINT,
+ GNOME_VFS_PRIORITY_DEFAULT,
deep_count_callback,
directory);
}
@@ -2360,11 +2357,8 @@ mime_list_load (NautilusDirectory *directory, const char *uri)
(&directory->details->mime_list_in_progress,
uri,
GNOME_VFS_FILE_INFO_GET_MIME_TYPE,
- GNOME_VFS_DIRECTORY_FILTER_NONE,
- (GNOME_VFS_DIRECTORY_FILTER_NOSELFDIR
- | GNOME_VFS_DIRECTORY_FILTER_NOPARENTDIR),
- NULL,
DIRECTORY_LOAD_ITEMS_PER_CALLBACK,
+ GNOME_VFS_PRIORITY_DEFAULT,
mime_list_callback,
directory);
}
@@ -2558,6 +2552,7 @@ top_left_start (NautilusDirectory *directory,
uri = nautilus_file_get_uri (file);
directory->details->top_left_read_state->handle = eel_read_file_async
(uri,
+ GNOME_VFS_PRIORITY_DEFAULT,
top_left_read_callback,
top_left_read_more_callback,
directory);
@@ -2687,6 +2682,7 @@ file_info_start (NautilusDirectory *directory,
&fake_list,
GNOME_VFS_FILE_INFO_GET_MIME_TYPE
| GNOME_VFS_FILE_INFO_FOLLOW_LINKS,
+ GNOME_VFS_PRIORITY_DEFAULT,
get_info_callback,
directory);
gnome_vfs_uri_unref (vfs_uri);
@@ -2755,7 +2751,7 @@ link_info_nautilus_link_read_callback (GnomeVFSResult result,
name = NULL;
icon = NULL;
} else {
- /* The gnome-xml parser requires a zero-terminated array. */
+ /* The libxml parser requires a zero-terminated array. */
buffer = g_realloc (file_contents, bytes_read + 1);
buffer[bytes_read] = '\0';
uri = nautilus_link_get_link_uri_given_file_contents (buffer, bytes_read);
@@ -2789,12 +2785,14 @@ link_info_gmc_link_read_callback (GnomeVFSResult result,
nautilus_directory_ref (directory);
+ uri = NULL;
+ name = NULL;
+ icon = NULL;
+ icon_path = NULL;
+
/* Handle the case where we read the GMC link. */
if (result != GNOME_VFS_OK || !eel_str_has_prefix (file_contents, "URL: ")) {
/* FIXME bugzilla.gnome.org 42433: We should report this error to the user. */
- uri = NULL;
- name = NULL;
- icon = NULL;
} else {
/* Make sure we don't run off the end of the buffer. */
end_of_line = memchr (file_contents, '\n', bytes_read);
@@ -2811,21 +2809,29 @@ link_info_gmc_link_read_callback (GnomeVFSResult result,
* have it here where the results will at least be cached than in
* nautilus_file_get_display_name.
*/
+#if GNOME2_CONVERSION_COMPLETE
res = gnome_metadata_get (path, "icon-name", &size, &name);
+ if (res != 0) {
+ name = NULL;
+ }
+#else
+ size = 0;
+ res = -1;
+#endif
} else {
res = -1;
}
- if (res != 0) {
- name = NULL;
- }
-
if (path != NULL) {
/* FIXME: this gnome_metata_get call is synchronous, but better to
* have it here where the results will at least be cached than in
* nautilus_file_get_display_name.
*/
+#if GNOME2_CONVERSION_COMPLETE
res = gnome_metadata_get (path, "icon-filename", &size, &icon_path);
+#else
+ res = -1;
+#endif
} else {
res = -1;
}
@@ -2954,18 +2960,21 @@ link_info_start (NautilusDirectory *directory,
if (gmc_style_link) {
directory->details->link_info_read_state->handle = eel_read_file_async
(uri,
+ GNOME_VFS_PRIORITY_DEFAULT,
link_info_gmc_link_read_callback,
link_info_gmc_link_read_more_callback,
directory);
} else if (is_directory) {
directory->details->link_info_read_state->handle = eel_read_entire_file_async
(dot_directory_uri,
+ GNOME_VFS_PRIORITY_DEFAULT,
link_info_nautilus_link_read_callback,
directory);
g_free (dot_directory_uri);
} else {
directory->details->link_info_read_state->handle = eel_read_entire_file_async
(uri,
+ GNOME_VFS_PRIORITY_DEFAULT,
link_info_nautilus_link_read_callback,
directory);
}
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 72176fc04..2cf4b71f7 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -42,6 +42,9 @@
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-utils.h>
+/* FIXME: Is there a better way to do this? */
+extern char *_gdk_display_name;
+
static void background_changed_callback (EelBackground *background,
NautilusFile *file);
static void background_reset_callback (EelBackground *background,
@@ -493,7 +496,7 @@ nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, g
xevent = (XEvent *) gdk_xevent;
- if (xevent->type == PropertyNotify && xevent->xproperty.atom == gdk_atom_intern("ESETROOT_PMAP_ID", TRUE)) {
+ if (xevent->type == PropertyNotify && xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID")) {
/* If we caused it, ignore it.
*/
@@ -545,7 +548,7 @@ nautilus_file_background_receive_root_window_changes (EelBackground *background)
NULL);
}
-/* Create a persistant pixmap. We create a separate display
+/* Create a persistent pixmap. We create a separate display
* and set the closedown mode on it to RetainPermanent
* (copied from gnome-source/control-panels/capplets/background-properties/render-background.c)
*/
@@ -557,7 +560,7 @@ make_root_pixmap (gint width, gint height)
gdk_flush ();
- display = XOpenDisplay (gdk_display_name);
+ display = XOpenDisplay (_gdk_display_name);
XSetCloseDownMode (display, RetainPermanent);
@@ -571,24 +574,6 @@ make_root_pixmap (gint width, gint height)
return gdk_pixmap_foreign_new (result);
}
-/* (copied from gnome-source/control-panels/capplets/background-properties/render-background.c)
- */
-static void
-dispose_root_pixmap (GdkPixmap *pixmap)
-{
- /* Unrefing a foreign pixmap causes it to be destroyed - so we include
- * this bad hack, that will work for GTK+-1.2 until the problem
- * is fixed in the next release
- */
-
- GdkWindowPrivate *private = (GdkWindowPrivate *)pixmap;
-
- gdk_xid_table_remove (private->xwindow);
- g_dataset_destroy (private);
- g_free (private);
-
-}
-
/* Set the root pixmap, and properties pointing to it. We
* do this atomically with XGrabServer to make sure that
* we won't leak the pixmap if somebody else it setting
@@ -605,14 +590,14 @@ set_root_pixmap (GdkPixmap *pixmap)
gulong bytes_after;
guchar *data_esetroot;
Pixmap pixmap_id;
- GdkAtom type;
+ Atom type;
data_esetroot = NULL;
XGrabServer (GDK_DISPLAY());
result = XGetWindowProperty (GDK_DISPLAY(), GDK_ROOT_WINDOW(),
- gdk_atom_intern("ESETROOT_PMAP_ID", FALSE),
+ gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID"),
0L, 1L, False, XA_PIXMAP,
&type, &format, &nitems, &bytes_after,
&data_esetroot);
@@ -632,15 +617,15 @@ set_root_pixmap (GdkPixmap *pixmap)
pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
XChangeProperty (GDK_DISPLAY(), GDK_ROOT_WINDOW(),
- gdk_atom_intern("ESETROOT_PMAP_ID", FALSE), XA_PIXMAP,
+ gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID"), XA_PIXMAP,
32, PropModeReplace,
(guchar *) &pixmap_id, 1);
XChangeProperty (GDK_DISPLAY(), GDK_ROOT_WINDOW(),
- gdk_atom_intern("_XROOTPMAP_ID", FALSE), XA_PIXMAP,
+ gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"), XA_PIXMAP,
32, PropModeReplace,
(guchar *) &pixmap_id, 1);
- XSetWindowBackgroundPixmap (GDK_DISPLAY(), GDK_ROOT_WINDOW(), pixmap_id);
+ XSetWindowBackgroundPixmap (GDK_DISPLAY (), GDK_ROOT_WINDOW (), pixmap_id);
XClearWindow (GDK_DISPLAY (), GDK_ROOT_WINDOW ());
XUngrabServer (GDK_DISPLAY());
@@ -678,14 +663,7 @@ image_loading_done_callback (EelBackground *background, gboolean successful_load
gdk_window_set_back_pixmap (background_window, pixmap, FALSE);
}
- /* We'd like to simply unref pixmap here, but due to a bug in gdk's handling of
- * foreign pixmaps, we can't - it would free the X resource.
- *
- * gdk_window_set_back_pixmap does not need the gdk pixmap object to stick around.
- * It simply uses X resource inside it. dispose_root_pixmap free's the gdk object
- * and not the X resource.
- */
- dispose_root_pixmap (pixmap);
+ gdk_pixmap_unref (pixmap);
}
static void
@@ -777,7 +755,7 @@ background_changed_callback (EelBackground *background,
* try to change the background.
*/
gtk_signal_handler_block_by_func (GTK_OBJECT (file),
- saved_settings_changed_callback,
+ G_CALLBACK (saved_settings_changed_callback),
background);
nautilus_file_set_metadata (file,
@@ -792,7 +770,7 @@ background_changed_callback (EelBackground *background,
/* Unblock the handler. */
gtk_signal_handler_unblock_by_func (GTK_OBJECT (file),
- saved_settings_changed_callback,
+ G_CALLBACK (saved_settings_changed_callback),
background);
}
@@ -840,7 +818,7 @@ initialize_background_from_settings (NautilusFile *file,
* in the metadata so it doesn't try to change the metadata.
*/
gtk_signal_handler_block_by_func (GTK_OBJECT (background),
- background_changed_callback,
+ G_CALLBACK (background_changed_callback),
file);
eel_background_set_color (background, color);
@@ -849,7 +827,7 @@ initialize_background_from_settings (NautilusFile *file,
/* Unblock the handler. */
gtk_signal_handler_unblock_by_func (GTK_OBJECT (background),
- background_changed_callback,
+ G_CALLBACK (background_changed_callback),
file);
g_free (color);
@@ -894,7 +872,7 @@ background_reset_callback (EelBackground *background,
* try to change the background.
*/
gtk_signal_handler_block_by_func (GTK_OBJECT (file),
- saved_settings_changed_callback,
+ G_CALLBACK (saved_settings_changed_callback),
background);
/* reset the metadata */
@@ -909,7 +887,7 @@ background_reset_callback (EelBackground *background,
NULL);
/* Unblock the handler. */
gtk_signal_handler_unblock_by_func (GTK_OBJECT (file),
- saved_settings_changed_callback,
+ G_CALLBACK (saved_settings_changed_callback),
background);
}
diff --git a/libnautilus-private/nautilus-directory-metafile-monitor.c b/libnautilus-private/nautilus-directory-metafile-monitor.c
index 1188d011f..9b966ce21 100644
--- a/libnautilus-private/nautilus-directory-metafile-monitor.c
+++ b/libnautilus-private/nautilus-directory-metafile-monitor.c
@@ -47,7 +47,7 @@ static void corba_metafile_changed (PortableServer_Servant servant,
static void corba_metafile_ready (PortableServer_Servant servant,
CORBA_Environment *ev);
-NAUTILUS_BONOBO_X_BOILERPLATE (NautilusMetafileMonitor, Nautilus_MetafileMonitor, BONOBO_X_OBJECT_TYPE, nautilus_metafile_monitor)
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileMonitor, nautilus_metafile_monitor, BONOBO_OBJECT_TYPE)
static void
nautilus_metafile_monitor_class_init (NautilusMetafileMonitorClass *klass)
diff --git a/libnautilus-private/nautilus-directory-metafile.c b/libnautilus-private/nautilus-directory-metafile.c
index d375e0867..11429f83d 100644
--- a/libnautilus-private/nautilus-directory-metafile.c
+++ b/libnautilus-private/nautilus-directory-metafile.c
@@ -31,7 +31,7 @@
#include "nautilus-directory-metafile-monitor.h"
#include "nautilus-metafile-server.h"
#include <eel/eel-string.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include <stdio.h>
static Nautilus_MetafileFactory factory = CORBA_OBJECT_NIL;
@@ -61,7 +61,7 @@ die_on_failed_activation (const char *server_name,
*/
const char *details;
- OAF_GeneralError *general_error;
+ Bonobo_GeneralError *general_error;
switch (ev->_major) {
case CORBA_NO_EXCEPTION:
@@ -71,7 +71,7 @@ die_on_failed_activation (const char *server_name,
case CORBA_SYSTEM_EXCEPTION:
case CORBA_USER_EXCEPTION:
details = CORBA_exception_id (ev);
- if (strcmp (details, "IDL:OAF/GeneralError:1.0") == 0) {
+ if (strcmp (details, "IDL:Bonobo/GeneralError:1.0") == 0) {
general_error = CORBA_exception_value (ev);
details = general_error->description;
}
@@ -83,7 +83,7 @@ die_on_failed_activation (const char *server_name,
}
g_error ("Failed to activate the server %s; this may indicate a broken\n"
- "Nautilus or OAF installation, or may reflect a bug in something,\n"
+ "Nautilus or Bonobo installation, or may reflect a bug in something,\n"
"or may mean that your PATH or LD_LIBRARY_PATH or the like is\n"
"incorrect. Nautilus will dump core and exit.\n"
"Details: '%s'", server_name, details);
@@ -99,7 +99,7 @@ get_factory (void)
if (get_factory_from_oaf) {
CORBA_exception_init (&ev);
- factory = oaf_activate_from_id (METAFILE_FACTORY_IID, 0,
+ factory = bonobo_activation_activate_from_id (METAFILE_FACTORY_IID, 0,
NULL, &ev);
if (ev._major != CORBA_NO_EXCEPTION || factory == CORBA_OBJECT_NIL) {
die_on_failed_activation ("Nautilus_MetafileFactory", &ev);
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index 0546990cf..e80ce6634 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -81,7 +81,6 @@ struct NautilusDirectoryDetails
NautilusFile *load_directory_file;
int load_file_count;
- GnomeVFSDirectoryFilter *load_file_count_filter;
GHashTable *load_mime_list_hash;
GList *get_file_infos_in_progress; /* list of GnomeVFSAsyncHandle * */
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 8fd819f59..b352e2d8a 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -64,9 +64,9 @@ static guint signals[LAST_SIGNAL];
static GHashTable *directories;
static void nautilus_directory_destroy (GtkObject *object);
-static void nautilus_directory_initialize (gpointer object,
+static void nautilus_directory_init (gpointer object,
gpointer klass);
-static void nautilus_directory_initialize_class (NautilusDirectoryClass *klass);
+static void nautilus_directory_class_init (NautilusDirectoryClass *klass);
static NautilusDirectory *nautilus_directory_new (const char *uri);
static char * real_get_name_for_self_as_new_file (NautilusDirectory *directory);
static void set_directory_uri (NautilusDirectory *directory,
@@ -77,7 +77,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusDirectory,
GTK_TYPE_OBJECT)
static void
-nautilus_directory_initialize_class (NautilusDirectoryClass *klass)
+nautilus_directory_class_init (NautilusDirectoryClass *klass)
{
GtkObjectClass *object_class;
@@ -86,41 +86,43 @@ nautilus_directory_initialize_class (NautilusDirectoryClass *klass)
object_class->destroy = nautilus_directory_destroy;
signals[FILES_ADDED] =
- gtk_signal_new ("files_added",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusDirectoryClass, files_added),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_signal_new ("files_added",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusDirectoryClass, files_added),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[FILES_CHANGED] =
- gtk_signal_new ("files_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusDirectoryClass, files_changed),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_signal_new ("files_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusDirectoryClass, files_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[DONE_LOADING] =
- gtk_signal_new ("done_loading",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusDirectoryClass, done_loading),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("done_loading",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusDirectoryClass, done_loading),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[LOAD_ERROR] =
- gtk_signal_new ("load_error",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusDirectoryClass, load_error),
- gtk_marshal_NONE__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ g_signal_new ("load_error",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusDirectoryClass, load_error),
+ NULL, NULL,
+ gtk_marshal_NONE__INT,
+ G_TYPE_NONE, 1, GTK_TYPE_INT);
klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
}
static void
-nautilus_directory_initialize (gpointer object, gpointer klass)
+nautilus_directory_init (gpointer object, gpointer klass)
{
NautilusDirectory *directory;
@@ -1562,7 +1564,7 @@ nautilus_directory_list_ref (GList *list)
void
nautilus_directory_list_unref (GList *list)
{
- eel_g_list_safe_for_each (list, (GFunc) nautilus_directory_unref, NULL);
+ g_list_foreach (list, (GFunc) nautilus_directory_unref, NULL);
}
/**
diff --git a/libnautilus-private/nautilus-drag-window.c b/libnautilus-private/nautilus-drag-window.c
index 0f039875e..fb83d7478 100644
--- a/libnautilus-private/nautilus-drag-window.c
+++ b/libnautilus-private/nautilus-drag-window.c
@@ -114,6 +114,8 @@ execute_pending_requests (GtkWindow *window,
}
}
+#if GNOME2_CONVERSION_COMPLETE
+
/* Called when no button-press event arrived occurred shortly after
* receiving a TAKE_FOCUS or RAISE_WINDOW request. So just commit
* the pending requests.
@@ -137,6 +139,8 @@ focus_timeout_callback (gpointer data)
return FALSE;
}
+#endif
+
static void
remove_focus_timeout (GtkWindow *window)
{
@@ -150,6 +154,8 @@ remove_focus_timeout (GtkWindow *window)
}
}
+#if GNOME2_CONVERSION_COMPLETE
+
static void
set_focus_timeout (GtkWindow *window)
{
@@ -165,10 +171,12 @@ set_focus_timeout (GtkWindow *window)
}
}
+#endif
+
/* Called for all button-press events; sets the `in_button_press' flag */
static gboolean
-button_press_emission_callback (GtkObject *object, guint signal_id,
- guint n_params, GtkArg *params,
+button_press_emission_callback (GSignalInvocationHint *ihint,
+ guint n_params, const GValue *params,
gpointer data)
{
GtkWidget *window;
@@ -178,7 +186,7 @@ button_press_emission_callback (GtkObject *object, guint signal_id,
* otherwise we can get duped into counting unbalanced
* press/release events, which isn't healthy
*/
- window = get_ancestor_blocked_by (GTK_WIDGET (object),
+ window = get_ancestor_blocked_by (GTK_WIDGET (g_value_get_object (&params[0])),
GTK_TYPE_WINDOW,
GTK_TYPE_MENU_SHELL);
if (window != NULL) {
@@ -204,14 +212,14 @@ button_press_emission_callback (GtkObject *object, guint signal_id,
/* Called for button-release events; commits any pending focus/raise */
static gboolean
-button_release_emission_callback (GtkObject *object, guint signal_id,
- guint n_params, GtkArg *params,
+button_release_emission_callback (GSignalInvocationHint *ihint,
+ guint n_params, const GValue *params,
gpointer data)
{
GtkWidget *window;
NautilusDragWindowDetails *details;
- window = get_ancestor_blocked_by (GTK_WIDGET (object),
+ window = get_ancestor_blocked_by (GTK_WIDGET (g_value_get_object (&params[0])),
GTK_TYPE_WINDOW,
GTK_TYPE_MENU_SHELL);
if (window != NULL) {
@@ -230,14 +238,14 @@ button_release_emission_callback (GtkObject *object, guint signal_id,
* widget emitting the signal, cancel any pending focus/raise requests
*/
static gboolean
-drag_begin_emission_callback (GtkObject *object, guint signal_id,
- guint n_params, GtkArg *params,
+drag_begin_emission_callback (GSignalInvocationHint *ihint,
+ guint n_params, const GValue *params,
gpointer data)
{
GtkWidget *window;
NautilusDragWindowDetails *details;
- window = gtk_widget_get_ancestor (GTK_WIDGET (object),
+ window = gtk_widget_get_ancestor (GTK_WIDGET (g_value_get_object (&params[0])),
GTK_TYPE_WINDOW);
if (window != NULL) {
details = get_details (GTK_WINDOW (window));
@@ -250,6 +258,8 @@ drag_begin_emission_callback (GtkObject *object, guint signal_id,
return TRUE;
}
+#if GNOME2_CONVERSION_COMPLETE
+
/* The process-wide filter for WM_PROTOCOLS client messages */
static GdkFilterReturn
wm_protocols_filter (GdkXEvent *xev, GdkEvent *event, gpointer data)
@@ -313,6 +323,8 @@ wm_protocols_filter (GdkXEvent *xev, GdkEvent *event, gpointer data)
}
}
+#endif
+
static void
nautilus_drag_window_destroy (GtkObject *object, gpointer data)
{
@@ -328,6 +340,7 @@ nautilus_drag_window_destroy (GtkObject *object, gpointer data)
static void
nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
{
+#if GNOME2_CONVERSION_COMPLETE
GdkAtom protocols[3];
/* Tell the window manager _not_ to focus this window by itself */
@@ -342,9 +355,9 @@ nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
protocols[1] = gdk_wm_take_focus;
protocols[2] = sawfish_wm_raise_window;
eel_gdk_window_set_wm_protocols (widget->window, protocols, 3);
+#endif
}
-
/* Public entry point */
/* initialize the instance's fields */
@@ -359,21 +372,18 @@ nautilus_drag_window_register (GtkWindow *window)
if (!initialized) {
/* Add emission hooks for the signals we need to monitor
*/
- signal_id = gtk_signal_lookup ("button_press_event",
- GTK_TYPE_WIDGET);
- gtk_signal_add_emission_hook (signal_id,
- button_press_emission_callback,
- NULL);
- signal_id = gtk_signal_lookup ("button_release_event",
- GTK_TYPE_WIDGET);
- gtk_signal_add_emission_hook (signal_id,
- button_release_emission_callback,
- NULL);
- signal_id = gtk_signal_lookup ("drag_begin",
- GTK_TYPE_WIDGET);
- gtk_signal_add_emission_hook (signal_id,
- drag_begin_emission_callback,
- NULL);
+ signal_id = g_signal_lookup ("button_press_event",
+ GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook (signal_id, 0,
+ button_press_emission_callback, NULL, NULL);
+ signal_id = g_signal_lookup ("button_release_event",
+ GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook (signal_id, 0,
+ button_release_emission_callback, NULL, NULL);
+ signal_id = g_signal_lookup ("drag_begin",
+ GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook (signal_id, 0,
+ drag_begin_emission_callback, NULL, NULL);
/* Intern the necessary X atoms
*/
@@ -381,11 +391,13 @@ nautilus_drag_window_register (GtkWindow *window)
"_SAWFISH_WM_RAISE_WINDOW",
False);
+#if GNOME2_CONVERSION_COMPLETE
/* Override the standard GTK filter for handling WM_PROTOCOLS
* client messages
*/
gdk_add_client_message_filter (gdk_wm_protocols,
wm_protocols_filter, NULL);
+#endif
initialized = TRUE;
}
@@ -397,7 +409,7 @@ nautilus_drag_window_register (GtkWindow *window)
details, g_free);
gtk_signal_connect (GTK_OBJECT (window), "realize",
- nautilus_drag_window_realize, NULL);
+ G_CALLBACK (nautilus_drag_window_realize), NULL);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
- nautilus_drag_window_destroy, NULL);
+ G_CALLBACK (nautilus_drag_window_destroy), NULL);
}
diff --git a/libnautilus-private/nautilus-druid-page-eazel.c b/libnautilus-private/nautilus-druid-page-eazel.c
deleted file mode 100644
index 030bcb45f..000000000
--- a/libnautilus-private/nautilus-druid-page-eazel.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/* gnome-druid-page-eazel.c
- * Copyright (C) 1999 Red Hat, Inc.
- * Copyright (C) 2000 Eazel, Inc.
- *
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- @NOTATION@
-*/
-
-#include <config.h>
-
-#include "nautilus-druid-page-eazel.h"
-
-#include <eel/eel-gtk-macros.h>
-
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/libgnomeui.h>
-#include <libgnomeui/gnome-druid.h>
-#include <libgnomeui/gnome-druid-page.h>
-
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "nautilus-druid.h"
-#include <libgnome/gnome-i18n.h>
-
-#include "nautilus-file-utilities.h"
-
-struct NautilusDruidPageEazelDetails
-{
- GnomeCanvasItem *background_item;
- GnomeCanvasItem *background_image_item;
- GnomeCanvasItem *topbar_image_item;
- int topbar_image_width;
- GnomeCanvasItem *topbar_image_stretch_item;
- GnomeCanvasItem *title_item;
- GtkWidget *title_label;
- guint title_label_signal_id;
- GnomeCanvasItem *text_item;
- GnomeCanvasItem *sidebar_image_item;
- GnomeCanvasItem *title_image_item;
- GnomeCanvasItem *widget_item;
-};
-
-static void nautilus_druid_page_eazel_initialize (NautilusDruidPageEazel *druid_page_eazel);
-static void nautilus_druid_page_eazel_initialize_class (NautilusDruidPageEazelClass *klass);
-static void nautilus_druid_page_eazel_destroy (GtkObject *object);
-static void nautilus_druid_page_eazel_finalize (GtkObject *object);
-static void nautilus_druid_page_eazel_construct (NautilusDruidPageEazel *druid_page_eazel);
-static void nautilus_druid_page_eazel_configure_size(NautilusDruidPageEazel *druid_page_eazel,
- gint width,
- gint height);
-static void nautilus_druid_page_eazel_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void nautilus_druid_page_eazel_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void nautilus_druid_page_eazel_prepare (GnomeDruidPage *page,
- GtkWidget *druid,
- gpointer *data);
-
-#define TITLE_X 60.0
-#define TITLE_Y 60.0
-#define CONTENT_PADDING 15.0
-#define DEFAULT_CONTENT_X 34.0
-#define DRUID_PAGE_MIN_HEIGHT 322
-#define DRUID_PAGE_MIN_WIDTH 516
-#define DRUID_PAGE_BORDER 24
-
-EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
-
-static void
-nautilus_druid_page_eazel_initialize_class (NautilusDruidPageEazelClass *klass)
-{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- object_class = (GtkObjectClass*) klass;
- widget_class = (GtkWidgetClass*) klass;
-
- parent_class = gtk_type_class (gnome_druid_page_get_type ());
-
- object_class->destroy = nautilus_druid_page_eazel_destroy;
- object_class->finalize = nautilus_druid_page_eazel_finalize;
-
- widget_class->size_allocate = nautilus_druid_page_eazel_size_allocate;
- widget_class->size_request = nautilus_druid_page_eazel_size_request;
-}
-
-static void
-nautilus_druid_page_eazel_initialize (NautilusDruidPageEazel *druid_page_eazel)
-{
- druid_page_eazel->details = g_new0(NautilusDruidPageEazelDetails, 1);
-
- /* Set up the canvas */
- gtk_container_set_border_width (GTK_CONTAINER (druid_page_eazel), 0);
- gtk_widget_push_visual (gdk_rgb_get_visual ());
- gtk_widget_push_colormap (gdk_rgb_get_cmap ());
- druid_page_eazel->canvas = gnome_canvas_new_aa ();
- gtk_widget_pop_visual ();
- gtk_widget_pop_colormap ();
- gtk_widget_show (druid_page_eazel->canvas);
- gtk_container_add (GTK_CONTAINER (druid_page_eazel), druid_page_eazel->canvas);
- nautilus_druid_page_eazel_configure_size (druid_page_eazel,
- DRUID_PAGE_MIN_WIDTH,
- DRUID_PAGE_MIN_HEIGHT);
-}
-
-static void
-nautilus_druid_page_eazel_destroy(GtkObject *object)
-{
- NautilusDruidPageEazel *druid_page_eazel =
- NAUTILUS_DRUID_PAGE_EAZEL(object);
-
- druid_page_eazel->canvas = NULL;
- druid_page_eazel->widget = NULL;
-
- g_free (druid_page_eazel->title);
- druid_page_eazel->title = NULL;
- g_free (druid_page_eazel->text);
- druid_page_eazel->text = NULL;
-
- if (druid_page_eazel->title_image != NULL)
- gdk_pixbuf_unref (druid_page_eazel->title_image);
- druid_page_eazel->title_image = NULL;
- if (druid_page_eazel->sidebar_image != NULL)
- gdk_pixbuf_unref (druid_page_eazel->sidebar_image);
- druid_page_eazel->sidebar_image = NULL;
-
- if (druid_page_eazel->widget != NULL)
- gtk_widget_unref (druid_page_eazel->widget);
- druid_page_eazel->widget = NULL;
-
- /* Chain destroy */
- EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_druid_page_eazel_finalize (GtkObject *object)
-{
- NautilusDruidPageEazel *druid_page_eazel =
- NAUTILUS_DRUID_PAGE_EAZEL(object);
-
- g_free(druid_page_eazel->details);
- druid_page_eazel->details = NULL;
-
- /* Chain finalize */
- EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
-}
-
-static void
-get_content_xy (NautilusDruidPageEazel *druid_page_eazel,
- double *content_x, double *content_y)
-{
- double title_height;
-
- if (druid_page_eazel->sidebar_image) {
- *content_x = gdk_pixbuf_get_width (druid_page_eazel->sidebar_image);
- } else {
- *content_x = DEFAULT_CONTENT_X;
- }
-
- if (druid_page_eazel->title_image) {
- *content_y = gdk_pixbuf_get_height (druid_page_eazel->title_image) + TITLE_Y + CONTENT_PADDING;
- } else {
- *content_y = TITLE_Y;
- }
-
- title_height = 0.0;
- if (druid_page_eazel->title && druid_page_eazel->title[0] != '\0') {
- gtk_object_get (GTK_OBJECT (druid_page_eazel->details->title_item),
- "height", &title_height,
- NULL);
- title_height += CONTENT_PADDING;
- }
-
- if (*content_y < title_height + TITLE_Y) {
- *content_y = title_height + TITLE_Y;
- }
-}
-
-
-static void
-nautilus_druid_page_eazel_configure_size (NautilusDruidPageEazel *druid_page_eazel, gint width, gint height)
-{
- double content_x;
- double content_y;
-
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- get_content_xy (druid_page_eazel, &content_x, &content_y);
-
- gnome_canvas_set_scroll_region (GNOME_CANVAS (druid_page_eazel->canvas),
- 0.0, 0.0, width, height);
-
- if (druid_page_eazel->details->background_item != NULL) {
- gnome_canvas_item_set (druid_page_eazel->details->background_item,
- "x1", 0.0,
- "y1", 0.0,
- "x2", (gfloat) width,
- "y2", (gfloat) height,
- NULL);
- }
-
- if (druid_page_eazel->details->topbar_image_stretch_item != NULL) {
- gnome_canvas_item_set (druid_page_eazel->details->topbar_image_stretch_item,
- "width", (double) (width - druid_page_eazel->details->topbar_image_width),
- "width_set", TRUE,
- NULL);
- }
-
- if (druid_page_eazel->details->widget_item != NULL) {
- gnome_canvas_item_set (druid_page_eazel->details->widget_item,
- "x", content_x,
- "y", content_y,
- NULL);
-
- /* Event boxes can handle not having the size set, and
- * not doing so allows them to scale with their child
- * widget. On the other hand, some other widgets require
- * the size to be set, otherwise they won't appear on the
- * canvas!
- */
- if (druid_page_eazel->widget != NULL && !GTK_IS_EVENT_BOX (druid_page_eazel->widget)) {
- gnome_canvas_item_set (druid_page_eazel->details->widget_item,
- "width", (gfloat) width - content_x,
- "height", (gfloat) height - content_y,
- NULL);
- }
- }
-
- if (druid_page_eazel->details->text_item != NULL) {
- gnome_canvas_item_set (druid_page_eazel->details->text_item,
- "x", content_x,
- "y", content_y,
- NULL);
- }
-}
-
-static void
-set_image (GnomeCanvasItem *item, const char *file,
- int *width, int *height)
-{
- char *fullname;
-
- if (width != NULL)
- *width = 0;
- if (height != NULL)
- *height = 0;
-
- fullname = nautilus_pixmap_file (file);
- if (fullname != NULL) {
- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (fullname);
- if (pixbuf != NULL) {
- if (width != NULL)
- *width = gdk_pixbuf_get_width (pixbuf);
- if (height != NULL)
- *height = gdk_pixbuf_get_height (pixbuf);
- gnome_canvas_item_set (item,
- "pixbuf", pixbuf,
- NULL);
- gdk_pixbuf_unref (pixbuf);
- }
- g_free (fullname);
- }
-}
-
-static void
-title_label_size_allocated (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
-{
- NautilusDruidPageEazel *druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL (data);
- gnome_canvas_item_set (druid_page_eazel->details->title_item,
- "size_pixels", TRUE,
- "height", (double) allocation->height,
- "width", (double) allocation->width,
- NULL);
-}
-
-
-static void
-nautilus_druid_page_eazel_construct (NautilusDruidPageEazel *druid_page_eazel)
-{
- druid_page_eazel->details->background_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_rect_get_type (),
- "x1", 0.0,
- "y1", 0.0,
- "fill_color", "white",
- NULL);
-
- druid_page_eazel->details->background_image_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_pixbuf_get_type (),
- "x", 0.0,
- "y", 0.0,
- "x_in_pixels", TRUE,
- "y_in_pixels", TRUE,
- NULL);
- if (druid_page_eazel->background_image)
- gnome_canvas_item_set (druid_page_eazel->details->background_image_item,
- "pixbuf", druid_page_eazel->background_image,
- NULL);
-
- druid_page_eazel->details->sidebar_image_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_pixbuf_get_type (),
- "x", 0.0,
- "y", 0.0,
- "x_in_pixels", TRUE,
- "y_in_pixels", TRUE,
- NULL);
- if (druid_page_eazel->sidebar_image)
- gnome_canvas_item_set (druid_page_eazel->details->sidebar_image_item,
- "pixbuf", druid_page_eazel->sidebar_image,
- NULL);
-
- druid_page_eazel->details->topbar_image_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_pixbuf_get_type (),
- "x", 0.0,
- "y", 0.0,
- "x_in_pixels", TRUE,
- "y_in_pixels", TRUE,
- NULL);
- set_image (druid_page_eazel->details->topbar_image_item,
- "druid_header.png",
- &druid_page_eazel->details->topbar_image_width,
- NULL);
-
- druid_page_eazel->details->topbar_image_stretch_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_pixbuf_get_type (),
- "x", (double)druid_page_eazel->details->topbar_image_width,
- "y", 0.0,
- "x_in_pixels", TRUE,
- "y_in_pixels", TRUE,
- NULL);
- set_image (druid_page_eazel->details->topbar_image_stretch_item,
- "druid_header_stretch.png", NULL, NULL);
-
- druid_page_eazel->details->title_image_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_pixbuf_get_type (),
- "x", TITLE_X,
- "y", TITLE_Y,
- "x_in_pixels", TRUE,
- "y_in_pixels", TRUE,
- NULL);
- if (druid_page_eazel->title_image)
- gnome_canvas_item_set (druid_page_eazel->details->title_image_item,
- "pixbuf", druid_page_eazel->title_image,
- NULL);
-
- druid_page_eazel->details->title_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_widget_get_type (),
- "x", TITLE_X,
- "y", TITLE_Y,
- NULL);
-
- druid_page_eazel->details->text_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_text_get_type (),
- "text", druid_page_eazel->text,
- "fill_color", "black",
- /* Note to localizers: this font is used for text items in Druid pages */
- "fontset", _("-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"),
- "anchor", GTK_ANCHOR_NW,
- NULL);
-
- nautilus_druid_page_eazel_configure_size (druid_page_eazel, DRUID_PAGE_MIN_WIDTH, DRUID_PAGE_MIN_HEIGHT);
- gtk_signal_connect (GTK_OBJECT (druid_page_eazel),
- "prepare",
- nautilus_druid_page_eazel_prepare,
- NULL);
-}
-
-static void
-nautilus_druid_page_eazel_prepare (GnomeDruidPage *page,
- GtkWidget *druid,
- gpointer *data)
-{
- switch (NAUTILUS_DRUID_PAGE_EAZEL (page)->position) {
- case NAUTILUS_DRUID_PAGE_EAZEL_START:
- gnome_druid_set_buttons_sensitive (GNOME_DRUID (druid), FALSE, TRUE, TRUE);
- gnome_druid_set_show_finish (GNOME_DRUID (druid), FALSE);
- gtk_widget_grab_default (GNOME_DRUID (druid)->next);
- break;
- case NAUTILUS_DRUID_PAGE_EAZEL_FINISH:
- gnome_druid_set_buttons_sensitive (GNOME_DRUID (druid), TRUE, FALSE, TRUE);
- gnome_druid_set_show_finish (GNOME_DRUID (druid), TRUE);
- gtk_widget_grab_default (GNOME_DRUID (druid)->finish);
- break;
- case NAUTILUS_DRUID_PAGE_EAZEL_OTHER:
- gnome_druid_set_buttons_sensitive (GNOME_DRUID (druid), TRUE, TRUE, TRUE);
- gnome_druid_set_show_finish (GNOME_DRUID (druid), FALSE);
- default:
- break;
- }
-}
-
-
-static void
-nautilus_druid_page_eazel_size_allocate(GtkWidget *widget,
- GtkAllocation *allocation)
-{
- EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
- (widget, allocation));
-
- gnome_canvas_set_scroll_region (GNOME_CANVAS (NAUTILUS_DRUID_PAGE_EAZEL (widget)->canvas),
- 0.0, 0.0,
- allocation->width,
- allocation->height);
-
- nautilus_druid_page_eazel_configure_size (NAUTILUS_DRUID_PAGE_EAZEL (widget),
- allocation->width,
- allocation->height);
-}
-
-static void
-nautilus_druid_page_eazel_size_request(GtkWidget *widget,
- GtkRequisition *requisition)
-{
- NautilusDruidPageEazel *druid_page_eazel;
-
- druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL (widget);
-
- EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
- (widget, requisition));
-
- if (druid_page_eazel->widget) {
- GtkRequisition child_requisition;
- double x, y;
-
- g_assert (druid_page_eazel->details->widget_item != NULL);
-
- get_content_xy (druid_page_eazel, &x, &y);
-
- gtk_widget_get_child_requisition (druid_page_eazel->widget,
- &child_requisition);
-
- if (child_requisition.width + x > requisition->width) {
- requisition->width = child_requisition.width + x + DRUID_PAGE_BORDER;
- }
- if (child_requisition.height + y > requisition->height) {
- requisition->height = child_requisition.height + y + DRUID_PAGE_BORDER;
- }
- }
-}
-
-
-/**
- * nautilus_druid_page_eazel_new:
- *
- * Creates a new NautilusDruidPageEazel widget.
- *
- * Return value: Pointer to new NautilusDruidPageEazel
- **/
-/* Public functions */
-GtkWidget *
-nautilus_druid_page_eazel_new (NautilusDruidPageEazelPosition position)
-{
- NautilusDruidPageEazel *page;
-
- page = NAUTILUS_DRUID_PAGE_EAZEL (gtk_widget_new (nautilus_druid_page_eazel_get_type (), NULL));
-
- page->position = position;
- page->title = g_strdup ("");
- page->text = g_strdup ("");
- page->title_image = NULL;
- page->sidebar_image = NULL;
- page->background_image = NULL;
- nautilus_druid_page_eazel_construct (page);
-
- return GTK_WIDGET (page);
-}
-/**
- * nautilus_druid_page_eazel_new_with_vals:
- * @title: The title.
- * @text: The introduction text.
- * @logo: The logo in the upper right corner.
- * @watermark: The watermark on the left.
- *
- * This will create a new GNOME Druid Eazel page, with the values
- * given. It is acceptable for any of them to be %NULL.
- *
- * Return value: GtkWidget pointer to new NautilusDruidPageEazel.
- **/
-GtkWidget *
-nautilus_druid_page_eazel_new_with_vals (NautilusDruidPageEazelPosition position,
- const gchar *title,
- const gchar* text,
- GdkPixbuf *title_image,
- GdkPixbuf *sidebar_image,
- GdkPixbuf *background_image)
-{
- NautilusDruidPageEazel *page;
-
- page = NAUTILUS_DRUID_PAGE_EAZEL (gtk_widget_new (nautilus_druid_page_eazel_get_type (), NULL));
-
- page->position = position;
- page->title = g_strdup (title ? title : "");
- page->text = g_strdup (text ? text : "");
-
- if (title_image)
- gdk_pixbuf_ref (title_image);
- page->title_image = title_image;
-
- if (sidebar_image)
- gdk_pixbuf_ref (sidebar_image);
- page->sidebar_image = sidebar_image;
-
- if (background_image)
- gdk_pixbuf_ref (background_image);
- page->background_image = background_image;
-
- nautilus_druid_page_eazel_construct (page);
-
- return GTK_WIDGET (page);
-}
-
-void
-nautilus_druid_page_eazel_set_text (NautilusDruidPageEazel *druid_page_eazel,
- const gchar *text)
-{
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- g_free (druid_page_eazel->text);
- druid_page_eazel->text = g_strdup (text ? text : "");
- gnome_canvas_item_set (druid_page_eazel->details->text_item,
- "text", druid_page_eazel->text,
- NULL);
-}
-
-static GtkWidget *
-make_title_label (const char *text)
-{
- GtkWidget *label;
- GtkStyle *new_style;
- GdkFont *font;
-
- label = gtk_label_new (text);
-
- /* Note to localizers: this font is used for page titles in Druid pages */
- font = gdk_fontset_load (_("-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"));
- if (font != NULL) {
- new_style = gtk_style_copy (gtk_widget_get_style (label));
- gdk_font_unref (new_style->font);
- new_style->font = font;
- gtk_widget_set_style (label, new_style);
- gtk_style_unref (new_style);
- }
-
- return label;
-}
-
-void
-nautilus_druid_page_eazel_set_title (NautilusDruidPageEazel *druid_page_eazel,
- const gchar *title)
-{
- GtkWidget *label;
-
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- g_free (druid_page_eazel->title);
- druid_page_eazel->title = g_strdup (title ? title : "");
-
- if (druid_page_eazel->details->title_label == NULL) {
- label = make_title_label (druid_page_eazel->title);
- nautilus_druid_page_eazel_set_title_label (druid_page_eazel, GTK_LABEL (label));
- } else {
- gtk_label_set_text (GTK_LABEL (druid_page_eazel->details->title_label), druid_page_eazel->title);
- }
-}
-
-void
-nautilus_druid_page_eazel_set_title_label (NautilusDruidPageEazel *druid_page_eazel,
- GtkLabel *label)
-{
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
- g_return_if_fail (GTK_IS_LABEL (label));
-
- if (druid_page_eazel->details->title_label != NULL) {
- gtk_signal_disconnect (GTK_OBJECT (druid_page_eazel->details->title_label),
- druid_page_eazel->details->title_label_signal_id);
- }
-
- gtk_widget_show (GTK_WIDGET (label));
- gnome_canvas_item_set (druid_page_eazel->details->title_item,
- "widget", label,
- NULL);
- druid_page_eazel->details->title_label = GTK_WIDGET (label);
- druid_page_eazel->details->title_label_signal_id =
- gtk_signal_connect (GTK_OBJECT (label), "size_allocate",
- title_label_size_allocated,
- druid_page_eazel);
-
- if (druid_page_eazel->title != NULL) {
- g_free (druid_page_eazel->title);
- }
- druid_page_eazel->title = g_strdup (label->label);
-}
-
-void
-nautilus_druid_page_eazel_set_title_image (NautilusDruidPageEazel *druid_page_eazel,
- GdkPixbuf *title_image)
-{
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- if (druid_page_eazel->title_image)
- gdk_pixbuf_unref (druid_page_eazel->title_image);
-
- druid_page_eazel->title_image = title_image;
- if (title_image != NULL)
- gdk_pixbuf_ref (title_image);
- gnome_canvas_item_set (druid_page_eazel->details->title_image_item,
- "pixbuf", druid_page_eazel->title_image, NULL);
-}
-
-void
-nautilus_druid_page_eazel_set_sidebar_image (NautilusDruidPageEazel *druid_page_eazel,
- GdkPixbuf *sidebar_image)
-{
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- if (druid_page_eazel->sidebar_image)
- gdk_pixbuf_unref (druid_page_eazel->sidebar_image);
-
- druid_page_eazel->sidebar_image = sidebar_image;
- if (sidebar_image != NULL)
- gdk_pixbuf_ref (sidebar_image);
- gnome_canvas_item_set (druid_page_eazel->details->sidebar_image_item,
- "pixbuf", druid_page_eazel->sidebar_image, NULL);
-}
-
-void
-nautilus_druid_page_eazel_set_background_image (NautilusDruidPageEazel *druid_page_eazel,
- GdkPixbuf *background_image)
-{
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- if (druid_page_eazel->background_image)
- gdk_pixbuf_unref (druid_page_eazel->background_image);
-
- druid_page_eazel->background_image = background_image;
- if (background_image != NULL)
- gdk_pixbuf_ref (background_image);
- gnome_canvas_item_set (druid_page_eazel->details->background_image_item,
- "pixbuf", druid_page_eazel->background_image, NULL);
-}
-
-void
-nautilus_druid_page_eazel_put_widget (NautilusDruidPageEazel *druid_page_eazel,
- GtkWidget *widget)
-{
- g_return_if_fail (druid_page_eazel != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID_PAGE_EAZEL (druid_page_eazel));
-
- if (druid_page_eazel->details->widget_item != NULL) {
- gtk_object_destroy (GTK_OBJECT (druid_page_eazel->details->widget_item));
- }
- if (druid_page_eazel->widget != NULL) {
- gtk_widget_unref (druid_page_eazel->widget);
- }
-
- druid_page_eazel->widget = widget;
- if (widget != NULL)
- gtk_widget_ref (widget);
-
- druid_page_eazel->details->widget_item =
- gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (druid_page_eazel->canvas)),
- gnome_canvas_widget_get_type (),
- "widget", widget,
- NULL);
-
- gtk_widget_queue_resize (GTK_WIDGET (druid_page_eazel));
-}
diff --git a/libnautilus-private/nautilus-druid-page-eazel.h b/libnautilus-private/nautilus-druid-page-eazel.h
deleted file mode 100644
index d0e51cfd9..000000000
--- a/libnautilus-private/nautilus-druid-page-eazel.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* nautilus-druid-page-eazel.h
- * Copyright (C) 1999 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- @NOTATION@
-*/
-#ifndef NAUTILUS_DRUID_PAGE_EAZEL_H
-#define NAUTILUS_DRUID_PAGE_EAZEL_H
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-druid-page.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-#define NAUTILUS_TYPE_DRUID_PAGE_EAZEL (nautilus_druid_page_eazel_get_type ())
-#define NAUTILUS_DRUID_PAGE_EAZEL(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_DRUID_PAGE_EAZEL, NautilusDruidPageEazel))
-#define NAUTILUS_DRUID_PAGE_EAZEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_DRUID_PAGE_EAZEL, NautilusDruidPageEazelClass))
-#define NAUTILUS_IS_DRUID_PAGE_EAZEL(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_DRUID_PAGE_EAZEL))
-#define NAUTILUS_IS_DRUID_PAGE_EAZEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_DRUID_PAGE_EAZEL))
-
-typedef enum {
- /* update structure when adding enums */
- NAUTILUS_DRUID_PAGE_EAZEL_START,
- NAUTILUS_DRUID_PAGE_EAZEL_FINISH,
- NAUTILUS_DRUID_PAGE_EAZEL_OTHER
-} NautilusDruidPageEazelPosition;
-
-
-typedef struct NautilusDruidPageEazel NautilusDruidPageEazel;
-typedef struct NautilusDruidPageEazelDetails NautilusDruidPageEazelDetails;
-typedef struct NautilusDruidPageEazelClass NautilusDruidPageEazelClass;
-
-struct NautilusDruidPageEazel
-{
- GnomeDruidPage parent;
-
- GtkWidget *canvas;
- char *title;
- char *text;
- GdkPixbuf *title_image;
- GdkPixbuf *sidebar_image;
- GdkPixbuf *background_image;
-
- GtkWidget *widget;
-
- NautilusDruidPageEazelPosition position : 2;
-
- /*< private >*/
- NautilusDruidPageEazelDetails *details;
-};
-
-struct NautilusDruidPageEazelClass
-{
- GnomeDruidPageClass parent_class;
-};
-
-GtkType nautilus_druid_page_eazel_get_type (void);
-GtkWidget *nautilus_druid_page_eazel_new (NautilusDruidPageEazelPosition position);
-GtkWidget *nautilus_druid_page_eazel_new_with_vals (NautilusDruidPageEazelPosition position,
- const gchar *title,
- const gchar *text,
- GdkPixbuf *title_image,
- GdkPixbuf *sidebar_image,
- GdkPixbuf *background_image);
-void nautilus_druid_page_eazel_put_widget (NautilusDruidPageEazel *druid_page_eazel,
- GtkWidget *widget);
-void nautilus_druid_page_eazel_set_text (NautilusDruidPageEazel *druid_page_eazel,
- const gchar *text);
-void nautilus_druid_page_eazel_set_title (NautilusDruidPageEazel *druid_page_eazel,
- const gchar *title);
-void nautilus_druid_page_eazel_set_title_label (NautilusDruidPageEazel *druid_page_eazel,
- GtkLabel *label);
-void nautilus_druid_page_eazel_set_title_image (NautilusDruidPageEazel *druid_page_eazel,
- GdkPixbuf *title_image);
-void nautilus_druid_page_eazel_set_sidebar_image (NautilusDruidPageEazel *druid_page_eazel,
- GdkPixbuf *sidebar_image);
-void nautilus_druid_page_eazel_set_background_image(NautilusDruidPageEazel *druid_page_eazel,
- GdkPixbuf *background_image);
-
-G_END_DECLS
-
-#endif /* NAUTILUS_DRUID_PAGE_EAZEL_H */
diff --git a/libnautilus-private/nautilus-druid.c b/libnautilus-private/nautilus-druid.c
deleted file mode 100644
index 49eeff81d..000000000
--- a/libnautilus-private/nautilus-druid.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* gnome-druid.c
- * Copyright (C) 1999 Red Hat, Inc.
- * Copyright (C) 2000 Eazel, Inc.
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- @NOTATION@
-*/
-#include <config.h>
-
-#include "nautilus-druid.h"
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <eel/eel-gtk-macros.h>
-
-static void nautilus_druid_initialize (NautilusDruid *druid);
-static void nautilus_druid_initialize_class(NautilusDruidClass *klass);
-static void nautilus_druid_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void nautilus_druid_size_allocate(GtkWidget *widget,
- GtkAllocation *allocation);
-
-EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
-
-static void
-nautilus_druid_initialize_class (NautilusDruidClass *klass)
-{
- GtkWidgetClass *widget_class;
-
- widget_class = (GtkWidgetClass*) klass;
-
- parent_class = gtk_type_class (gtk_container_get_type ());
-
- widget_class->size_request = nautilus_druid_size_request;
- widget_class->size_allocate = nautilus_druid_size_allocate;
-}
-
-static void
-nautilus_druid_initialize (NautilusDruid *druid)
-{
-}
-
-static void
-nautilus_druid_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- guint16 temp_width, temp_height;
- GList *list;
- GnomeDruid *druid;
- GtkRequisition child_requisition;
- GnomeDruidPage *child;
- int border;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID (widget));
-
- border = GTK_CONTAINER(widget)->border_width;
-
- druid = GNOME_DRUID (widget);
- temp_height = temp_width = 0;
-
- /* We find the maximum size of all children widgets */
- for (list = druid->children; list; list = list->next) {
- child = GNOME_DRUID_PAGE (list->data);
- if (GTK_WIDGET_VISIBLE (child)) {
- gtk_widget_size_request (GTK_WIDGET (child), &child_requisition);
- temp_width = MAX (temp_width, child_requisition.width);
- temp_height = MAX (temp_height, child_requisition.height);
- if (GTK_WIDGET_MAPPED (child) && child != druid->current)
- gtk_widget_unmap (GTK_WIDGET(child));
- }
- }
-
- requisition->width = temp_width + 2 * border;
- requisition->height = temp_height + 2 * border;
-
- /* In an Attempt to show how the widgets are packed,
- * here's a little diagram.
- *
- * [ Cancel ] ------------- [ Back ] [ Next ]
- * |
- * This part needs to be at least 1 button width.
- * In addition, there is a GNOME_PAD_SMALL between Next and Back.
- */
- /* our_button width is temp_width and temp_height */
- temp_height = 0;
- temp_width = 0;
-
- gtk_widget_size_request (druid->back, &child_requisition);
- temp_width = MAX (temp_width, child_requisition.width);
- temp_height = MAX (temp_height, child_requisition.height);
-
- gtk_widget_size_request (druid->next, &child_requisition);
- temp_width = MAX (temp_width, child_requisition.width);
- temp_height = MAX (temp_height, child_requisition.height);
-
- gtk_widget_size_request (druid->cancel, &child_requisition);
- temp_width = MAX (temp_width, child_requisition.width);
- temp_height = MAX (temp_height, child_requisition.height);
-
- gtk_widget_size_request (druid->finish, &child_requisition);
- temp_width = MAX (temp_width, child_requisition.width);
- temp_height = MAX (temp_height, child_requisition.height);
-
- temp_width += border * 2;
- temp_height += GNOME_PAD_SMALL;
- temp_width = temp_width * 4 + GNOME_PAD_SMALL * 3;
-
- /* pick which is bigger, the buttons, or the NautilusDruidPages */
- requisition->width = MAX (temp_width, requisition->width);
- requisition->height += temp_height;
-}
-
-static void
-nautilus_druid_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GnomeDruid *druid;
- GtkAllocation child_allocation;
- gint button_height;
- GList *list;
- int border;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (NAUTILUS_IS_DRUID (widget));
-
- druid = GNOME_DRUID (widget);
- widget->allocation = *allocation;
-
- /* deal with the buttons */
- child_allocation.width = child_allocation.height = 0;
- child_allocation.width = druid->back->requisition.width;
- child_allocation.height = druid->back->requisition.height;
- child_allocation.width = MAX (child_allocation.width,
- druid->next->requisition.width);
- child_allocation.height = MAX (child_allocation.height,
- druid->next->requisition.height);
- child_allocation.width = MAX (child_allocation.width,
- druid->cancel->requisition.width);
- child_allocation.height = MAX (child_allocation.height,
- druid->cancel->requisition.height);
-
- child_allocation.height += GNOME_PAD_SMALL;
- button_height = child_allocation.height;
- child_allocation.width += 2 * GNOME_PAD_SMALL;
- child_allocation.y = allocation->y + allocation->height -
- GNOME_PAD_SMALL - child_allocation.height;
-
- /* allocate cancel */
- child_allocation.x = allocation->x + GNOME_PAD_SMALL;
- gtk_widget_size_allocate (druid->cancel, &child_allocation);
-
-
- /* Allocate next/finish */
- child_allocation.x = allocation->x + allocation->width -
- GNOME_PAD_SMALL - child_allocation.width;
- gtk_widget_size_allocate (druid->next, &child_allocation);
- gtk_widget_size_allocate (druid->finish, &child_allocation);
-
- /* Allocate back */
- child_allocation.x -= (GNOME_PAD_SMALL + child_allocation.width);
- gtk_widget_size_allocate (druid->back, &child_allocation);
-
- border = GTK_CONTAINER (widget)->border_width;
-
- /* Put up the GnomeDruidPage */
- child_allocation.x = allocation->x + border;
- child_allocation.y = allocation->y + border;
- child_allocation.width =
- ((allocation->width - 2 * border) > 0) ?
- (allocation->width - 2 * border):0;
- child_allocation.height =
- ((allocation->height - 2 * border - GNOME_PAD_SMALL - button_height) > 0) ?
- (allocation->height - 2 * border - GNOME_PAD_SMALL - button_height):0;
- for (list = druid->children; list; list=list->next) {
- if (GTK_WIDGET_VISIBLE (list->data)) {
- gtk_widget_size_allocate (GTK_WIDGET (list->data), &child_allocation);
- }
- }
-}
-
-/* Public methods */
-GtkWidget *
-nautilus_druid_new (void)
-{
- return gtk_widget_new (NAUTILUS_TYPE_DRUID, NULL);
-}
diff --git a/libnautilus-private/nautilus-druid.h b/libnautilus-private/nautilus-druid.h
deleted file mode 100644
index 950035cf9..000000000
--- a/libnautilus-private/nautilus-druid.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* nautilus-druid.h
- * Copyright (C) 1999 Red Hat, Inc.
- * Copyright (C) 2000 Eazel, Inc.
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- @NOTATION@
-*/
-#ifndef NAUTILUS_DRUID_H
-#define NAUTILUS_DRUID_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-druid.h>
-
-G_BEGIN_DECLS
-
-#define NAUTILUS_TYPE_DRUID (nautilus_druid_get_type ())
-#define NAUTILUS_DRUID(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_DRUID, NautilusDruid))
-#define NAUTILUS_DRUID_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_DRUID, NautilusDruidClass))
-#define NAUTILUS_IS_DRUID(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_DRUID))
-#define NAUTILUS_IS_DRUID_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_DRUID))
-
-
-typedef struct NautilusDruid NautilusDruid;
-typedef struct NautilusDruidClass NautilusDruidClass;
-
-struct NautilusDruid
-{
- GnomeDruid gnome_druid;
-};
-struct NautilusDruidClass
-{
- GnomeDruidClass parent_class;
-};
-
-
-GtkType nautilus_druid_get_type (void);
-GtkWidget *nautilus_druid_new (void);
-
-G_END_DECLS
-
-#endif /* NAUTILUS_DRUID_H */
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 264ee39c8..fd57448e3 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -27,15 +27,15 @@
#include <config.h>
#include "nautilus-entry.h"
+#include <string.h>
+#include "nautilus-global-preferences.h"
+#include "nautilus-undo-signal-handlers.h"
+#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
-#include <eel/eel-gdk-extensions.h>
-#include "nautilus-global-preferences.h"
-#include "nautilus-undo-signal-handlers.h"
-#include <orb/orbit.h>
struct NautilusEntryDetails {
gboolean use_emacs_shortcuts;
@@ -51,8 +51,8 @@ enum {
};
static guint signals[LAST_SIGNAL];
-static void nautilus_entry_initialize (NautilusEntry *entry);
-static void nautilus_entry_initialize_class (NautilusEntryClass *class);
+static void nautilus_entry_init (NautilusEntry *entry);
+static void nautilus_entry_class_init (NautilusEntryClass *class);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusEntry,
nautilus_entry,
@@ -70,7 +70,7 @@ emacs_shortcuts_preference_changed_callback (gpointer callback_data)
}
static void
-nautilus_entry_initialize (NautilusEntry *entry)
+nautilus_entry_init (NautilusEntry *entry)
{
GtkWidget *widget;
@@ -140,13 +140,13 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
NautilusEntry *entry;
GtkEditable *editable;
int position;
- gboolean had_selection;
+ gboolean old_has, new_has;
gboolean result;
entry = NAUTILUS_ENTRY (widget);
editable = GTK_EDITABLE (widget);
- if (!editable->editable) {
+ if (!gtk_editable_get_editable (editable)) {
return FALSE;
}
@@ -158,7 +158,7 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
* should position the insertion point at the end of
* the selection.
*/
- if (entry->details->special_tab_handling && editable->has_selection) {
+ if (entry->details->special_tab_handling && gtk_editable_get_selection_bounds (editable, NULL, NULL)) {
position = strlen (gtk_entry_get_text (GTK_ENTRY (editable)));
gtk_entry_select_region (GTK_ENTRY (editable), position, position);
return TRUE;
@@ -189,7 +189,7 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
obscure_cursor (entry);
- had_selection = editable->has_selection;
+ old_has = gtk_editable_get_selection_bounds (editable, NULL, NULL);
result = EEL_CALL_PARENT_WITH_RETURN_VALUE
(GTK_WIDGET_CLASS, key_press_event, (widget, event));
@@ -197,8 +197,11 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
/* Pressing a key usually changes the selection if there is a selection.
* If there is not selection, we can save work by not emitting a signal.
*/
- if (result && (had_selection || editable->has_selection)) {
- gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+ if (result) {
+ new_has = gtk_editable_get_selection_bounds (editable, NULL, NULL);
+ if (old_has || new_has) {
+ gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+ }
}
return result;
@@ -209,7 +212,8 @@ static gboolean
nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event)
{
int result;
- guint old_start_pos, old_end_pos;
+ gboolean old_had, new_had;
+ int old_start, old_end, new_start, new_end;
GdkCursor *cursor;
NautilusEntry *entry;
GtkEditable *editable;
@@ -225,16 +229,17 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event)
entry->details->cursor_obscured = FALSE;
}
- old_start_pos = editable->selection_start_pos;
- old_end_pos = editable->selection_end_pos;
+ old_had = gtk_editable_get_selection_bounds (editable, &old_start, &old_end);
result = EEL_CALL_PARENT_WITH_RETURN_VALUE
(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
/* Send a signal if dragging the mouse caused the selection to change. */
- if (result && (old_start_pos != editable->selection_start_pos
- || old_end_pos != editable->selection_end_pos)) {
- gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+ if (result) {
+ new_had = gtk_editable_get_selection_bounds (editable, &new_start, &new_end);
+ if (old_had != new_had || (old_had && (old_start != new_start || old_end != new_end))) {
+ gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+ }
}
return result;
@@ -317,12 +322,12 @@ nautilus_entry_set_text (NautilusEntry *entry, const gchar *text)
}
static void
-nautilus_entry_set_selection (GtkEditable *editable,
- int start_pos,
- int end_pos)
+nautilus_entry_set_selection_bounds (GtkEditable *editable,
+ int start_pos,
+ int end_pos)
{
- EEL_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection,
- (editable, start_pos, end_pos));
+ EEL_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection_bounds,
+ (editable, start_pos, end_pos));
gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
}
@@ -419,7 +424,7 @@ nautilus_entry_selection_clear (GtkWidget *widget,
}
static void
-nautilus_entry_initialize_class (NautilusEntryClass *class)
+nautilus_entry_class_init (NautilusEntryClass *class)
{
GtkWidgetClass *widget_class;
GtkObjectClass *object_class;
@@ -439,26 +444,27 @@ nautilus_entry_initialize_class (NautilusEntryClass *class)
editable_class->insert_text = nautilus_entry_insert_text;
editable_class->delete_text = nautilus_entry_delete_text;
- editable_class->set_selection = nautilus_entry_set_selection;
+ editable_class->set_selection_bounds = nautilus_entry_set_selection_bounds;
/* Set up signals */
- signals[USER_CHANGED] = gtk_signal_new
+ signals[USER_CHANGED] = g_signal_new
("user_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusEntryClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusEntryClass,
user_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[SELECTION_CHANGED] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[SELECTION_CHANGED] = g_signal_new
("selection_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusEntryClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusEntryClass,
selection_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ G_TYPE_NONE, 0);
}
void
diff --git a/libnautilus-private/nautilus-entry.h b/libnautilus-private/nautilus-entry.h
index c77c2f058..74126e2d2 100644
--- a/libnautilus-private/nautilus-entry.h
+++ b/libnautilus-private/nautilus-entry.h
@@ -27,7 +27,6 @@
#ifndef NAUTILUS_ENTRY_H
#define NAUTILUS_ENTRY_H
-#include <libgnome/gnome-defs.h>
#include <gtk/gtkentry.h>
G_BEGIN_DECLS
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index a72340a5c..c49d46c34 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -39,7 +39,7 @@
#include <gtk/gtkprogressbar.h>
#include <gtk/gtktable.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomevfs/gnome-vfs-utils.h>
/* The width of the progress bar determines the minimum width of the
@@ -53,8 +53,8 @@
#define MINIMUM_TIME_UP 1000
-static void nautilus_file_operations_progress_initialize_class (NautilusFileOperationsProgressClass *klass);
-static void nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *dialog);
+static void nautilus_file_operations_progress_class_init (NautilusFileOperationsProgressClass *klass);
+static void nautilus_file_operations_progress_init (NautilusFileOperationsProgress *dialog);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
nautilus_file_operations_progress,
@@ -193,7 +193,7 @@ delete_event_callback (GtkWidget *widget,
}
static void
-nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *progress)
+nautilus_file_operations_progress_init (NautilusFileOperationsProgress *progress)
{
GtkBox *vbox;
GtkWidget *hbox;
@@ -256,7 +256,7 @@ nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *pr
}
static void
-nautilus_file_operations_progress_initialize_class (NautilusFileOperationsProgressClass *klass)
+nautilus_file_operations_progress_class_init (NautilusFileOperationsProgressClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 1f6a300ba..511a6ebd6 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -102,8 +102,7 @@ transfer_info_destroy (TransferInfo *transfer_info)
}
if (transfer_info->debuting_uris != NULL) {
- eel_g_hash_table_destroy_deep_custom
- (transfer_info->debuting_uris, (GFunc) g_free, NULL, NULL, NULL);
+ g_hash_table_destroy (transfer_info->debuting_uris);
}
g_free (transfer_info);
@@ -196,14 +195,8 @@ icon_position_iterator_get_next (IconPositionIterator *position_iterator,
return TRUE;
}
-/* Hack to get the GdkFont used by a GtkLabel in an error dialog.
- * We need to do this because the string truncation needs to be
- * done before a dialog is instantiated.
- *
- * This is probably not super fast but it is not a problem in the
- * context we are using it, truncating a string while displaying an
- * error dialog.
- */
+#if GNOME2_CONVERSION_COMPLETE
+
static GdkFont *
get_label_font (void)
{
@@ -225,12 +218,15 @@ get_label_font (void)
return font;
}
+#endif
+
static char *
ellipsize_string_for_dialog (const char *str)
{
+ char *result;
+#ifdef GNOME2_CONVERSION_COMPLETE
GdkFont *font;
int maximum_width;
- char *result;
/* get a nice length to ellipsize to, based on the font */
font = get_label_font ();
@@ -238,6 +234,9 @@ ellipsize_string_for_dialog (const char *str)
result = eel_string_ellipsize (str, font, maximum_width, EEL_ELLIPSIZE_MIDDLE);
gdk_font_unref (font);
+#else
+ result = g_strdup (str);
+#endif
return result;
}
@@ -1619,9 +1618,9 @@ sync_transfer_callback (GnomeVFSXferProgressInfo *progress_info, gpointer data)
progress_info->target_name);
}
if (debuting_uris != NULL) {
- g_hash_table_insert (debuting_uris,
- g_strdup (progress_info->target_name),
- GINT_TO_POINTER (TRUE));
+ g_hash_table_replace (debuting_uris,
+ g_strdup (progress_info->target_name),
+ GINT_TO_POINTER (TRUE));
}
}
nautilus_file_changes_queue_file_added (progress_info->target_name);
@@ -1652,9 +1651,9 @@ sync_transfer_callback (GnomeVFSXferProgressInfo *progress_info, gpointer data)
}
if (debuting_uris != NULL) {
- g_hash_table_insert (debuting_uris,
- g_strdup (progress_info->target_name),
- GINT_TO_POINTER (really_moved));
+ g_hash_table_replace (debuting_uris,
+ g_strdup (progress_info->target_name),
+ GINT_TO_POINTER (really_moved));
}
}
if (really_moved) {
@@ -2036,7 +2035,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
transfer_info->overwrite_mode = GNOME_VFS_XFER_OVERWRITE_MODE_QUERY;
transfer_info->done_callback = done_callback;
transfer_info->done_callback_data = done_callback_data;
- transfer_info->debuting_uris = g_hash_table_new (g_str_hash, g_str_equal);
+ transfer_info->debuting_uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
sync_transfer_info = g_new (SyncTransferInfo, 1);
sync_transfer_info->iterator = icon_position_iterator;
@@ -2046,6 +2045,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
gnome_vfs_async_xfer (&transfer_info->handle, source_uri_list, target_uri_list,
move_options, GNOME_VFS_XFER_ERROR_MODE_QUERY,
GNOME_VFS_XFER_OVERWRITE_MODE_QUERY,
+ GNOME_VFS_PRIORITY_DEFAULT,
update_transfer_callback, transfer_info,
sync_transfer_callback, sync_transfer_info);
}
@@ -2178,6 +2178,7 @@ nautilus_file_operations_new_folder (GtkWidget *parent_view,
GNOME_VFS_XFER_NEW_UNIQUE_DIRECTORY,
GNOME_VFS_XFER_ERROR_MODE_QUERY,
GNOME_VFS_XFER_OVERWRITE_MODE_QUERY,
+ GNOME_VFS_PRIORITY_DEFAULT,
new_folder_transfer_callback, state,
sync_transfer_callback, NULL);
@@ -2220,6 +2221,7 @@ nautilus_file_operations_delete (const GList *item_uris,
GNOME_VFS_XFER_DELETE_ITEMS | GNOME_VFS_XFER_RECURSIVE,
GNOME_VFS_XFER_ERROR_MODE_QUERY,
GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+ GNOME_VFS_PRIORITY_DEFAULT,
update_transfer_callback, transfer_info,
sync_transfer_callback, NULL);
@@ -2254,6 +2256,7 @@ do_empty_trash (GtkWidget *parent_view)
GNOME_VFS_XFER_EMPTY_DIRECTORIES,
GNOME_VFS_XFER_ERROR_MODE_QUERY,
GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+ GNOME_VFS_PRIORITY_DEFAULT,
update_transfer_callback, transfer_info,
sync_transfer_callback, NULL);
}
@@ -2264,7 +2267,7 @@ do_empty_trash (GtkWidget *parent_view)
static gboolean
confirm_empty_trash (GtkWidget *parent_view)
{
- GnomeDialog *dialog;
+ GtkDialog *dialog;
GtkWindow *parent_window;
/* Just Say Yes if the preference says not to confirm. */
@@ -2282,9 +2285,9 @@ confirm_empty_trash (GtkWidget *parent_view)
GNOME_STOCK_BUTTON_CANCEL,
parent_window);
- gnome_dialog_set_default (dialog, GNOME_CANCEL);
+ gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
- return gnome_dialog_run (dialog) == GNOME_OK;
+ return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
}
void
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 53397c2b3..a5b05aab5 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -36,6 +36,7 @@
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
+#include <unistd.h>
#define NAUTILUS_USER_DIRECTORY_NAME ".nautilus"
#define DEFAULT_NAUTILUS_DIRECTORY_MODE (0755)
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 531109c84..a856ee1b2 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -46,11 +46,7 @@
#include <libxml/parser.h>
#include <grp.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-dentry.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-metadata.h>
-#include <libgnome/gnome-mime.h>
#include <libgnomevfs/gnome-vfs-file-info.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-info.h>
@@ -59,6 +55,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/time.h>
+#include <time.h>
/* Time in seconds to cache getpwuid results */
#define GETPWUID_CACHE_TIME (5*60)
@@ -104,8 +101,8 @@ static guint signals[LAST_SIGNAL];
static GHashTable *symbolic_links;
-static void nautilus_file_initialize_class (NautilusFileClass *klass);
-static void nautilus_file_initialize (NautilusFile *file);
+static void nautilus_file_class_init (NautilusFileClass *klass);
+static void nautilus_file_init (NautilusFile *file);
static void destroy (GtkObject *object);
static char * nautilus_file_get_owner_as_string (NautilusFile *file,
gboolean include_real_name);
@@ -116,7 +113,7 @@ static gboolean update_info_and_name (NautilusFile *file,
EEL_DEFINE_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
static void
-nautilus_file_initialize_class (NautilusFileClass *klass)
+nautilus_file_class_init (NautilusFileClass *klass)
{
GtkObjectClass *object_class;
@@ -125,26 +122,26 @@ nautilus_file_initialize_class (NautilusFileClass *klass)
object_class->destroy = destroy;
signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusFileClass, changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusFileClass, changed),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[UPDATED_DEEP_COUNT_IN_PROGRESS] =
- gtk_signal_new ("updated_deep_count_in_progress",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusFileClass, updated_deep_count_in_progress),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ g_signal_new ("updated_deep_count_in_progress",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusFileClass, updated_deep_count_in_progress),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
}
static void
-nautilus_file_initialize (NautilusFile *file)
+nautilus_file_init (NautilusFile *file)
{
file->details = g_new0 (NautilusFileDetails, 1);
}
@@ -1013,7 +1010,9 @@ nautilus_file_rename (NautilusFile *file,
g_free (uri);
if (path != NULL) {
+#ifdef GNOME2_CONVERSION_COMPLETE
gnome_metadata_set (path, "icon-caption", strlen (new_name) + 1, new_name);
+#endif
g_free (path);
(* callback) (file, GNOME_VFS_OK, callback_data);
@@ -1078,6 +1077,7 @@ nautilus_file_rename (NautilusFile *file,
GNOME_VFS_SET_FILE_INFO_NAME,
(GNOME_VFS_FILE_INFO_GET_MIME_TYPE
| GNOME_VFS_FILE_INFO_FOLLOW_LINKS),
+ GNOME_VFS_PRIORITY_DEFAULT,
rename_callback, op);
gnome_vfs_file_info_unref (partial_file_info);
gnome_vfs_uri_unref (vfs_uri);
@@ -2144,7 +2144,9 @@ nautilus_file_set_metadata (NautilusFile *file,
icon_path = gnome_vfs_get_local_path_from_uri (metadata);
if (local_path != NULL && icon_path != NULL) {
+#ifdef GNOME2_CONVERSION_COMPLETE
gnome_metadata_set (local_path, "icon-filename", strlen (icon_path)+1, icon_path);
+#endif
}
g_free (icon_path);
@@ -3027,6 +3029,7 @@ nautilus_file_set_permissions (NautilusFile *file,
GNOME_VFS_SET_FILE_INFO_PERMISSIONS,
(GNOME_VFS_FILE_INFO_GET_MIME_TYPE
| GNOME_VFS_FILE_INFO_FOLLOW_LINKS),
+ GNOME_VFS_PRIORITY_DEFAULT,
set_permissions_callback, op);
gnome_vfs_file_info_unref (partial_file_info);
gnome_vfs_uri_unref (vfs_uri);
@@ -3285,6 +3288,7 @@ set_owner_and_group (NautilusFile *file,
GNOME_VFS_SET_FILE_INFO_OWNER,
(GNOME_VFS_FILE_INFO_GET_MIME_TYPE
| GNOME_VFS_FILE_INFO_FOLLOW_LINKS),
+ GNOME_VFS_PRIORITY_DEFAULT,
set_owner_and_group_callback, op);
gnome_vfs_file_info_unref (partial_file_info);
gnome_vfs_uri_unref (uri);
@@ -5036,7 +5040,7 @@ nautilus_file_list_ref (GList *list)
void
nautilus_file_list_unref (GList *list)
{
- eel_g_list_safe_for_each (list, (GFunc) nautilus_file_unref, NULL);
+ g_list_foreach (list, (GFunc) nautilus_file_unref, NULL);
}
/**
@@ -5161,8 +5165,8 @@ nautilus_self_check_file (void)
file_1 = nautilus_file_get ("file:///home/");
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1->details->directory)->ref_count, 1);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_1)->ref_count, 1);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_1->details->directory)->ref_count, 1);
EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 1);
nautilus_file_unref (file_1);
@@ -5178,13 +5182,13 @@ nautilus_self_check_file (void)
nautilus_file_list_ref (list);
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 2);
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 2);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_1)->ref_count, 2);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_2)->ref_count, 2);
nautilus_file_list_unref (list);
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_1)->ref_count, 1);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_2)->ref_count, 1);
nautilus_file_list_free (list);
@@ -5224,8 +5228,8 @@ nautilus_self_check_file (void)
file_1 = nautilus_file_get ("file:///etc");
file_2 = nautilus_file_get ("file:///usr");
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
- EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_1)->ref_count, 1);
+ EEL_CHECK_INTEGER_RESULT (G_OBJECT (file_2)->ref_count, 1);
EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_DISPLAY_NAME, FALSE, FALSE) < 0, TRUE);
EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_DISPLAY_NAME, FALSE, TRUE) > 0, TRUE);
diff --git a/libnautilus-private/nautilus-find-icon-image.c b/libnautilus-private/nautilus-find-icon-image.c
index ba6a7595d..404568698 100644
--- a/libnautilus-private/nautilus-find-icon-image.c
+++ b/libnautilus-private/nautilus-find-icon-image.c
@@ -32,7 +32,6 @@
#include <eel/eel-glib-extensions.h>
#include <eel/eel-string.h>
#include <eel/eel-xml-extensions.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
@@ -197,7 +196,7 @@ get_themed_icon_file_path (const NautilusIconTheme *icon_theme,
include_size = icon_size != NAUTILUS_ICON_SIZE_STANDARD;
/* Try each suffix. */
- for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
+ for (i = 0; i < G_N_ELEMENTS (icon_file_name_suffixes); i++) {
if (include_size && g_strcasecmp (icon_file_name_suffixes[i], ".svg") != 0) {
/* Build a path for this icon. */
partial_path = g_strdup_printf ("%s-%u",
@@ -314,7 +313,7 @@ get_user_emblem_path (const char *name, guint icon_size)
user_directory = nautilus_get_user_directory ();
path = NULL;
- for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
+ for (i = 0; i < G_N_ELEMENTS (icon_file_name_suffixes); i++) {
path = g_strdup_printf ("%s/emblems/%s%s",
user_directory,
name + strlen (NAUTILUS_EMBLEM_NAME_PREFIX),
@@ -387,7 +386,7 @@ nautilus_remove_icon_file_name_suffix (const char *icon_name)
guint i;
const char *suffix;
- for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
+ for (i = 0; i < G_N_ELEMENTS (icon_file_name_suffixes); i++) {
suffix = icon_file_name_suffixes[i];
if (eel_str_has_suffix (icon_name, suffix)) {
return eel_str_strip_trailing_str (icon_name, suffix);
diff --git a/libnautilus-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c
index 9041efcf8..732d92371 100644
--- a/libnautilus-private/nautilus-font-factory.c
+++ b/libnautilus-private/nautilus-font-factory.c
@@ -66,8 +66,8 @@ typedef struct {
static NautilusFontFactory *global_font_factory = NULL;
static GtkType nautilus_font_factory_get_type (void);
-static void nautilus_font_factory_initialize_class (NautilusFontFactoryClass *class);
-static void nautilus_font_factory_initialize (NautilusFontFactory *factory);
+static void nautilus_font_factory_class_init (NautilusFontFactoryClass *class);
+static void nautilus_font_factory_init (NautilusFontFactory *factory);
static void destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusFontFactory,
@@ -101,13 +101,13 @@ nautilus_font_factory_get (void)
}
static void
-nautilus_font_factory_initialize (NautilusFontFactory *factory)
+nautilus_font_factory_init (NautilusFontFactory *factory)
{
factory->fonts = g_hash_table_new (g_str_hash, g_str_equal);
}
static void
-nautilus_font_factory_initialize_class (NautilusFontFactoryClass *class)
+nautilus_font_factory_class_init (NautilusFontFactoryClass *class)
{
GtkObjectClass *object_class;
@@ -115,6 +115,8 @@ nautilus_font_factory_initialize_class (NautilusFontFactoryClass *class)
object_class->destroy = destroy;
}
+#if GNOME2_CONVERSION_COMPLETE
+
static FontHashNode *
font_hash_node_alloc (const char *name)
{
@@ -128,6 +130,8 @@ font_hash_node_alloc (const char *name)
return node;
}
+#endif
+
static void
font_hash_node_free (FontHashNode *node)
{
@@ -168,6 +172,8 @@ destroy (GtkObject *object)
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
+#if GNOME2_CONVERSION_COMPLETE
+
static FontHashNode *
font_hash_node_lookup (const char *name)
{
@@ -276,7 +282,7 @@ nautilus_font_factory_get_font_from_preferences (guint size_in_pixels)
static gboolean icon_view_font_auto_value_registered;
static const char *icon_view_font_auto_value;
- /* Can't initialize this in initialize_class, because no font factory
+ /* Can't initialize this in class_init, because no font factory
* instance may yet exist when this is called.
*/
if (!icon_view_font_auto_value_registered) {
@@ -290,3 +296,5 @@ nautilus_font_factory_get_font_from_preferences (guint size_in_pixels)
*/
return nautilus_font_factory_get_font_by_family (icon_view_font_auto_value, size_in_pixels);
}
+
+#endif
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 225bf418c..b7ed52222 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -882,18 +882,18 @@ get_default_folder_viewer_preference_from_iid (const char *iid)
static gpointer
default_default_folder_viewer_callback (int user_level)
{
- OAF_ServerInfo *oaf_info;
+ Bonobo_ServerInfo *bonobo_activation_info;
int result;
- oaf_info = gnome_vfs_mime_get_default_component ("x-directory/normal");
- if (oaf_info == NULL) {
+ bonobo_activation_info = gnome_vfs_mime_get_default_component ("x-directory/normal");
+ if (bonobo_activation_info == NULL) {
result = NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW;
} else {
- result = get_default_folder_viewer_preference_from_iid (oaf_info->iid);
+ result = get_default_folder_viewer_preference_from_iid (bonobo_activation_info->iid);
if (result == NAUTILUS_DEFAULT_FOLDER_VIEWER_OTHER) {
result = NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW;
}
- CORBA_free (oaf_info);
+ CORBA_free (bonobo_activation_info);
}
return GINT_TO_POINTER (result);
@@ -1072,7 +1072,7 @@ default_icon_view_sort_order_or_manual_layout_changed_callback (gpointer callbac
}
void
-nautilus_global_preferences_initialize (void)
+nautilus_global_preferences_init (void)
{
static gboolean initialized = FALSE;
@@ -1082,7 +1082,7 @@ nautilus_global_preferences_initialize (void)
initialized = TRUE;
- eel_preferences_initialize ("/apps/nautilus");
+ eel_preferences_init ("/apps/nautilus");
/* Install defaults */
global_preferences_install_defaults ();
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 32c943b75..da9f15a4c 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -188,7 +188,7 @@ typedef enum
#define NAUTILUS_PREFERENCES_ADD_TO_SESSION "preferences/add_to_session"
-void nautilus_global_preferences_initialize (void);
+void nautilus_global_preferences_init (void);
/* Sidebar */
struct EelScalableFont *nautilus_global_preferences_get_icon_view_smooth_font (void);
diff --git a/libnautilus-private/nautilus-horizontal-splitter.c b/libnautilus-private/nautilus-horizontal-splitter.c
index 615b46102..f904a7ae4 100644
--- a/libnautilus-private/nautilus-horizontal-splitter.c
+++ b/libnautilus-private/nautilus-horizontal-splitter.c
@@ -44,8 +44,8 @@ struct NautilusHorizontalSplitterDetails {
#define SPLITTER_CLICK_TIMEOUT 400
/* NautilusHorizontalSplitterClass methods */
-static void nautilus_horizontal_splitter_initialize_class (NautilusHorizontalSplitterClass *horizontal_splitter_class);
-static void nautilus_horizontal_splitter_initialize (NautilusHorizontalSplitter *horizontal_splitter);
+static void nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizontal_splitter_class);
+static void nautilus_horizontal_splitter_init (NautilusHorizontalSplitter *horizontal_splitter);
static gboolean nautilus_horizontal_splitter_button_press (GtkWidget *widget,
GdkEventButton *event);
static gboolean nautilus_horizontal_splitter_button_release (GtkWidget *widget,
@@ -66,7 +66,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
/* GtkObjectClass methods */
static void
-nautilus_horizontal_splitter_initialize_class (NautilusHorizontalSplitterClass *horizontal_splitter_class)
+nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizontal_splitter_class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -86,7 +86,7 @@ nautilus_horizontal_splitter_initialize_class (NautilusHorizontalSplitterClass *
}
static void
-nautilus_horizontal_splitter_initialize (NautilusHorizontalSplitter *horizontal_splitter)
+nautilus_horizontal_splitter_init (NautilusHorizontalSplitter *horizontal_splitter)
{
horizontal_splitter->details = g_new0 (NautilusHorizontalSplitterDetails, 1);
e_paned_set_handle_size (E_PANED (horizontal_splitter), BAR_WIDTH);
diff --git a/libnautilus-private/nautilus-horizontal-splitter.h b/libnautilus-private/nautilus-horizontal-splitter.h
index 30f94834a..4db95128b 100644
--- a/libnautilus-private/nautilus-horizontal-splitter.h
+++ b/libnautilus-private/nautilus-horizontal-splitter.h
@@ -25,7 +25,6 @@
#ifndef NAUTILUS_HORIZONTAL_SPLITTER_H
#define NAUTILUS_HORIZONTAL_SPLITTER_H
-#include <libgnome/gnome-defs.h>
#include "e-hpaned.h"
G_BEGIN_DECLS
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 50eb59280..52e4ad23f 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -31,8 +31,8 @@
#include <gtk/gtksignal.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-icon-text.h>
+#include <libgnomecanvas/gnome-canvas-util.h>
+#include <libgnomecanvas/gnome-icon-text.h>
#include <libart_lgpl/art_rgb.h>
#include <libart_lgpl/art_rgb_affine.h>
#include <libart_lgpl/art_rgb_rgba_affine.h>
@@ -156,8 +156,8 @@ static guint32 highlight_text_info_color = EEL_RGBA_COLOR_PACK (0xCC, 0xCC, 0x
static int click_policy_auto_value;
/* GtkObject */
-static void nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class);
-static void nautilus_icon_canvas_item_initialize (NautilusIconCanvasItem *item);
+static void nautilus_icon_canvas_item_class_init (NautilusIconCanvasItemClass *class);
+static void nautilus_icon_canvas_item_init (NautilusIconCanvasItem *item);
static void nautilus_icon_canvas_item_destroy (GtkObject *object);
static int nautilus_icon_canvas_item_event (GnomeCanvasItem *item,
GdkEvent *event);
@@ -235,7 +235,7 @@ free_layout_cache (void)
/* Class initialization function for the icon canvas item. */
static void
-nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class)
+nautilus_icon_canvas_item_class_init (NautilusIconCanvasItemClass *class)
{
GtkObjectClass *object_class;
GnomeCanvasItemClass *item_class;
@@ -249,9 +249,9 @@ nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class)
item_class = GNOME_CANVAS_ITEM_CLASS (class);
gtk_object_add_arg_type ("NautilusIconCanvasItem::editable_text",
- GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_EDITABLE_TEXT);
+ G_TYPE_STRING, GTK_ARG_READWRITE, ARG_EDITABLE_TEXT);
gtk_object_add_arg_type ("NautilusIconCanvasItem::additional_text",
- GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ADDITIONAL_TEXT);
+ G_TYPE_STRING, GTK_ARG_READWRITE, ARG_ADDITIONAL_TEXT);
gtk_object_add_arg_type ("NautilusIconCanvasItem::font",
GTK_TYPE_BOXED, GTK_ARG_READWRITE, ARG_FONT);
gtk_object_add_arg_type ("NautilusIconCanvasItem::highlighted_for_selection",
@@ -270,15 +270,14 @@ nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class)
object_class->get_arg = nautilus_icon_canvas_item_get_arg;
signals[BOUNDS_CHANGED]
- = gtk_signal_new ("bounds_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconCanvasItemClass,
+ = g_signal_new ("bounds_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconCanvasItemClass,
bounds_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
item_class->update = nautilus_icon_canvas_item_update;
item_class->draw = nautilus_icon_canvas_item_draw;
@@ -293,7 +292,7 @@ nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class)
/* Object initialization function for the icon item. */
static void
-nautilus_icon_canvas_item_initialize (NautilusIconCanvasItem *icon_item)
+nautilus_icon_canvas_item_init (NautilusIconCanvasItem *icon_item)
{
NautilusIconCanvasItemDetails *details;
@@ -981,7 +980,7 @@ draw_stretch_handles (NautilusIconCanvasItem *item, GdkDrawable *drawable,
gc = gdk_gc_new (drawable);
knob_filename = nautilus_theme_get_image_path ("knob.png");
- knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename);
+ knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL);
knob_width = gdk_pixbuf_get_width (knob_pixbuf);
knob_height = gdk_pixbuf_get_height (knob_pixbuf);
@@ -1084,7 +1083,7 @@ draw_stretch_handles_aa (NautilusIconCanvasItem *item, GnomeCanvasBuf *buf,
canvas_item = GNOME_CANVAS_ITEM (item);
knob_filename = nautilus_theme_get_image_path ("knob.png");
- knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename);
+ knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL);
knob_width = gdk_pixbuf_get_width (knob_pixbuf);
knob_height = gdk_pixbuf_get_height (knob_pixbuf);
@@ -1292,7 +1291,7 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item)
/* Load the audio symbol. */
audio_filename = nautilus_pixmap_file ("audio.png");
if (audio_filename != NULL) {
- audio_pixbuf = gdk_pixbuf_new_from_file (audio_filename);
+ audio_pixbuf = gdk_pixbuf_new_from_file (audio_filename, NULL);
} else {
audio_pixbuf = NULL;
}
@@ -2104,7 +2103,7 @@ hit_test_stretch_handle (NautilusIconCanvasItem *item,
}
knob_filename = nautilus_theme_get_image_path ("knob.png");
- knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename);
+ knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL);
knob_width = gdk_pixbuf_get_width (knob_pixbuf);
knob_height = gdk_pixbuf_get_height (knob_pixbuf);
diff --git a/libnautilus-private/nautilus-icon-canvas-item.h b/libnautilus-private/nautilus-icon-canvas-item.h
index 0672cc96b..23db9117c 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.h
+++ b/libnautilus-private/nautilus-icon-canvas-item.h
@@ -25,8 +25,7 @@
#ifndef NAUTILUS_ICON_CANVAS_ITEM_H
#define NAUTILUS_ICON_CANVAS_ITEM_H
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
+#include <libgnomecanvas/gnome-canvas.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "nautilus-icon-factory.h"
#include <eel/eel-scalable-font.h>
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index e736edf51..06b9d3f94 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -42,7 +42,7 @@
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-string.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtklayout.h>
#include <gtk/gtkmain.h>
@@ -120,8 +120,8 @@ enum {
};
static void activate_selected_items (NautilusIconContainer *container);
-static void nautilus_icon_container_initialize_class (NautilusIconContainerClass *class);
-static void nautilus_icon_container_initialize (NautilusIconContainer *container);
+static void nautilus_icon_container_class_init (NautilusIconContainerClass *class);
+static void nautilus_icon_container_init (NautilusIconContainer *container);
static void nautilus_icon_container_theme_changed (gpointer user_data);
static void compute_stretch (StretchState *start,
@@ -2314,7 +2314,7 @@ destroy (GtkObject *object)
gtk_idle_remove (container->details->stretch_idle_id);
}
- for (i = 0; i < EEL_N_ELEMENTS (container->details->label_font); i++) {
+ for (i = 0; i < G_N_ELEMENTS (container->details->label_font); i++) {
if (container->details->label_font[i] != NULL)
gdk_font_unref (container->details->label_font[i]);
}
@@ -3031,7 +3031,7 @@ key_press_event (GtkWidget *widget,
/* Initialization. */
static void
-nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
+nautilus_icon_container_class_init (NautilusIconContainerClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -3048,173 +3048,191 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
/* Signals. */
signals[SELECTION_CHANGED]
- = gtk_signal_new ("selection_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("selection_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
selection_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[BUTTON_PRESS]
- = gtk_signal_new ("button_press",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("button_press",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
button_press),
- gtk_marshal_BOOL__POINTER,
- GTK_TYPE_BOOL, 1,
- GTK_TYPE_GDK_EVENT);
+ NULL, NULL,
+ gtk_marshal_BOOL__POINTER,
+ GTK_TYPE_BOOL, 1,
+ GDK_TYPE_EVENT);
signals[ACTIVATE]
- = gtk_signal_new ("activate",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("activate",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
activate),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[CONTEXT_CLICK_SELECTION]
- = gtk_signal_new ("context_click_selection",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("context_click_selection",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
context_click_selection),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[CONTEXT_CLICK_BACKGROUND]
- = gtk_signal_new ("context_click_background",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("context_click_background",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
context_click_background),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[MIDDLE_CLICK]
- = gtk_signal_new ("middle_click",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("middle_click",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
middle_click),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[ICON_POSITION_CHANGED]
- = gtk_signal_new ("icon_position_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("icon_position_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
icon_position_changed),
- gtk_marshal_NONE__POINTER_POINTER,
- GTK_TYPE_NONE, 2,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER_POINTER,
+ G_TYPE_NONE, 2,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
signals[ICON_TEXT_CHANGED]
- = gtk_signal_new ("icon_text_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("icon_text_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
icon_text_changed),
- gtk_marshal_NONE__POINTER_POINTER,
- GTK_TYPE_NONE, 2,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER_POINTER,
+ G_TYPE_NONE, 2,
GTK_TYPE_POINTER,
- GTK_TYPE_STRING);
+ G_TYPE_STRING);
signals[ICON_STRETCH_STARTED]
- = gtk_signal_new ("icon_stretch_started",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("icon_stretch_started",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
icon_stretch_started),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[ICON_STRETCH_ENDED]
- = gtk_signal_new ("icon_stretch_ended",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("icon_stretch_ended",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
icon_stretch_ended),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[RENAMING_ICON]
- = gtk_signal_new ("renaming_icon",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("renaming_icon",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
renaming_icon),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[GET_ICON_IMAGES]
- = gtk_signal_new ("get_icon_images",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("get_icon_images",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
get_icon_images),
- eel_gtk_marshal_POINTER__POINTER_STRING_POINTER,
- GTK_TYPE_POINTER, 3,
+ NULL, NULL,
+ eel_gtk_marshal_POINTER__POINTER_STRING_POINTER,
+ GTK_TYPE_POINTER, 3,
GTK_TYPE_POINTER,
- GTK_TYPE_STRING,
+ G_TYPE_STRING,
GTK_TYPE_POINTER);
signals[GET_ICON_TEXT]
- = gtk_signal_new ("get_icon_text",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("get_icon_text",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
get_icon_text),
- eel_gtk_marshal_NONE__POINTER_STRING_STRING,
- GTK_TYPE_NONE, 3,
+ NULL, NULL,
+ eel_gtk_marshal_NONE__POINTER_STRING_STRING,
+ G_TYPE_NONE, 3,
GTK_TYPE_POINTER,
- GTK_TYPE_STRING,
- GTK_TYPE_STRING);
+ G_TYPE_STRING,
+ G_TYPE_STRING);
signals[GET_ICON_URI]
- = gtk_signal_new ("get_icon_uri",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("get_icon_uri",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
get_icon_uri),
- eel_gtk_marshal_STRING__POINTER,
- GTK_TYPE_STRING, 1,
+ NULL, NULL,
+ eel_gtk_marshal_STRING__POINTER,
+ G_TYPE_STRING, 1,
GTK_TYPE_POINTER);
signals[GET_ICON_DROP_TARGET_URI]
- = gtk_signal_new ("get_icon_drop_target_uri",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("get_icon_drop_target_uri",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
get_icon_drop_target_uri),
- eel_gtk_marshal_STRING__POINTER,
- GTK_TYPE_STRING, 1,
+ NULL, NULL,
+ eel_gtk_marshal_STRING__POINTER,
+ G_TYPE_STRING, 1,
GTK_TYPE_POINTER);
signals[COMPARE_ICONS]
- = gtk_signal_new ("compare_icons",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("compare_icons",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
compare_icons),
- eel_gtk_marshal_INT__POINTER_POINTER,
- GTK_TYPE_INT, 2,
+ NULL, NULL,
+ eel_gtk_marshal_INT__POINTER_POINTER,
+ GTK_TYPE_INT, 2,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
signals[COMPARE_ICONS_BY_NAME]
- = gtk_signal_new ("compare_icons_by_name",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("compare_icons_by_name",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
compare_icons_by_name),
- eel_gtk_marshal_INT__POINTER_POINTER,
- GTK_TYPE_INT, 2,
+ NULL, NULL,
+ eel_gtk_marshal_INT__POINTER_POINTER,
+ GTK_TYPE_INT, 2,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
signals[MOVE_COPY_ITEMS]
- = gtk_signal_new ("move_copy_items",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("move_copy_items",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
move_copy_items),
- eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
- GTK_TYPE_NONE, 6,
+ NULL, NULL,
+ eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
+ G_TYPE_NONE, 6,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER,
@@ -3222,82 +3240,88 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
GTK_TYPE_INT,
GTK_TYPE_INT);
signals[HANDLE_URI_LIST]
- = gtk_signal_new ("handle_uri_list",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("handle_uri_list",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
handle_uri_list),
- eel_gtk_marshal_NONE__POINTER_INT_INT_INT,
- GTK_TYPE_NONE, 4,
+ NULL, NULL,
+ eel_gtk_marshal_NONE__POINTER_INT_INT_INT,
+ G_TYPE_NONE, 4,
GTK_TYPE_POINTER,
GTK_TYPE_INT,
GTK_TYPE_INT,
GTK_TYPE_INT);
signals[GET_CONTAINER_URI]
- = gtk_signal_new ("get_container_uri",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("get_container_uri",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
get_container_uri),
- eel_gtk_marshal_STRING__NONE,
- GTK_TYPE_STRING, 0);
+ NULL, NULL,
+ eel_gtk_marshal_STRING__NONE,
+ G_TYPE_STRING, 0);
signals[CAN_ACCEPT_ITEM]
- = gtk_signal_new ("can_accept_item",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("can_accept_item",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
can_accept_item),
- eel_gtk_marshal_INT__POINTER_STRING,
- GTK_TYPE_INT, 2,
+ NULL, NULL,
+ eel_gtk_marshal_INT__POINTER_STRING,
+ GTK_TYPE_INT, 2,
GTK_TYPE_POINTER,
- GTK_TYPE_STRING);
+ G_TYPE_STRING);
signals[GET_STORED_ICON_POSITION]
- = gtk_signal_new ("get_stored_icon_position",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("get_stored_icon_position",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
get_stored_icon_position),
- eel_gtk_marshal_BOOL__POINTER_POINTER,
- GTK_TYPE_BOOL, 2,
+ NULL, NULL,
+ eel_gtk_marshal_BOOL__POINTER_POINTER,
+ GTK_TYPE_BOOL, 2,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
signals[LAYOUT_CHANGED]
- = gtk_signal_new ("layout_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("layout_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
layout_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[PREVIEW]
- = gtk_signal_new ("preview",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("preview",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
preview),
- eel_gtk_marshal_INT__POINTER_INT,
- GTK_TYPE_INT, 2,
+ NULL, NULL,
+ eel_gtk_marshal_INT__POINTER_INT,
+ GTK_TYPE_INT, 2,
GTK_TYPE_POINTER,
GTK_TYPE_BOOL);
signals[BAND_SELECT_STARTED]
- = gtk_signal_new ("band_select_started",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("band_select_started",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
band_select_started),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[BAND_SELECT_ENDED]
- = gtk_signal_new ("band_select_ended",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
+ = g_signal_new ("band_select_ended",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconContainerClass,
band_select_ended),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
/* GtkWidget class. */
@@ -3327,7 +3351,7 @@ handle_focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer user_d
}
static void
-nautilus_icon_container_initialize (NautilusIconContainer *container)
+nautilus_icon_container_init (NautilusIconContainer *container)
{
NautilusIconContainerDetails *details;
EelBackground *background;
@@ -5128,7 +5152,7 @@ nautilus_icon_container_theme_changed (gpointer user_data)
gdk_pixbuf_unref (container->details->highlight_frame);
}
- container->details->highlight_frame = gdk_pixbuf_new_from_file (text_frame_path);
+ container->details->highlight_frame = gdk_pixbuf_new_from_file (text_frame_path, NULL);
g_free (text_frame_path);
/* load the highlight color */
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index 77748c6d6..02385a6cd 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -26,7 +26,7 @@
#ifndef NAUTILUS_ICON_CONTAINER_H
#define NAUTILUS_ICON_CONTAINER_H
-#include <libgnomeui/gnome-canvas.h>
+#include <libgnomecanvas/gnome-canvas.h>
#include "nautilus-icon-factory.h"
#include <eel/eel-scalable-font.h>
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index e94d76452..82b79e1ec 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -48,8 +48,8 @@
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -496,7 +496,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
if (drop_types_list == NULL)
drop_types_list = gtk_target_list_new (drop_types,
- EEL_N_ELEMENTS (drop_types));
+ G_N_ELEMENTS (drop_types));
for (target = context->targets; target != NULL; target = target->next) {
guint dummy_info;
@@ -1211,7 +1211,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
container->details->dnd_info = g_new0 (NautilusIconDndInfo, 1);
eel_drag_init (&container->details->dnd_info->drag_info,
- drag_types, EEL_N_ELEMENTS (drag_types), stipple);
+ drag_types, G_N_ELEMENTS (drag_types), stipple);
/* Set up the widget as a drag destination.
* (But not a source, as drags starting from this widget will be
@@ -1219,7 +1219,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
*/
gtk_drag_dest_set (GTK_WIDGET (container),
0,
- drop_types, EEL_N_ELEMENTS (drop_types),
+ drop_types, G_N_ELEMENTS (drop_types),
GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK
| GDK_ACTION_ASK);
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 294766e6a..02c8f73b1 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -49,7 +49,6 @@
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-dentry.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-file-info.h>
@@ -232,8 +231,8 @@ static int cached_thumbnail_limit;
/* forward declarations */
static guint nautilus_icon_factory_get_type (void);
-static void nautilus_icon_factory_initialize_class (NautilusIconFactoryClass *class);
-static void nautilus_icon_factory_initialize (NautilusIconFactory *factory);
+static void nautilus_icon_factory_class_init (NautilusIconFactoryClass *class);
+static void nautilus_icon_factory_init (NautilusIconFactory *factory);
static void nautilus_icon_factory_destroy (GtkObject *object);
static void icon_theme_changed_callback (gpointer user_data);
static void thumbnail_limit_changed_callback (gpointer user_data);
@@ -346,19 +345,19 @@ load_thumbnail_frames (NautilusIconFactory *factory)
if (factory->thumbnail_frame != NULL) {
gdk_pixbuf_unref (factory->thumbnail_frame);
}
- factory->thumbnail_frame = gdk_pixbuf_new_from_file (image_path);
+ factory->thumbnail_frame = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
image_path = nautilus_theme_get_image_path ("thumbnail_frame.aa.png");
if (factory->thumbnail_frame_aa != NULL) {
gdk_pixbuf_unref (factory->thumbnail_frame_aa);
}
- factory->thumbnail_frame_aa = gdk_pixbuf_new_from_file (image_path);
+ factory->thumbnail_frame_aa = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
}
static void
-nautilus_icon_factory_initialize (NautilusIconFactory *factory)
+nautilus_icon_factory_init (NautilusIconFactory *factory)
{
factory->scalable_icons = g_hash_table_new (nautilus_scalable_icon_hash,
nautilus_scalable_icon_equal);
@@ -374,21 +373,20 @@ nautilus_icon_factory_initialize (NautilusIconFactory *factory)
}
static void
-nautilus_icon_factory_initialize_class (NautilusIconFactoryClass *class)
+nautilus_icon_factory_class_init (NautilusIconFactoryClass *class)
{
GtkObjectClass *object_class;
object_class = GTK_OBJECT_CLASS (class);
signals[ICONS_CHANGED]
- = gtk_signal_new ("icons_changed",
- GTK_RUN_LAST,
- object_class->type,
- 0,
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ = g_signal_new ("icons_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
object_class->destroy = nautilus_icon_factory_destroy;
}
@@ -1537,7 +1535,7 @@ load_icon_from_path (const char *path,
return nautilus_thumbnail_load_framed_image (path, optimized_for_aa);
}
- return gdk_pixbuf_new_from_file (path);
+ return gdk_pixbuf_new_from_file (path, NULL);
}
static GdkPixbuf *
@@ -1664,7 +1662,7 @@ load_icon_for_scaling (NautilusScalableIcon *scalable_icon,
size_request.maximum_height = size_request.maximum_width;
size_request.optimized_for_aa = optimized_for_aa;
- for (i = 0; i < EEL_N_ELEMENTS (requests); i++) {
+ for (i = 0; i < G_N_ELEMENTS (requests); i++) {
actual_size = 0;
while (get_next_icon_size_to_try (requested_size, &actual_size)) {
size_request.nominal_width = actual_size;
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h
index 4286d69dc..448389425 100644
--- a/libnautilus-private/nautilus-icon-factory.h
+++ b/libnautilus-private/nautilus-icon-factory.h
@@ -26,10 +26,11 @@
#ifndef NAUTILUS_ICON_FACTORY_H
#define NAUTILUS_ICON_FACTORY_H
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libnautilus-private/nautilus-file.h>
#include <eel/eel-string-list.h>
+#include <gdk/gdktypes.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkobject.h>
+#include <libnautilus-private/nautilus-file.h>
/* NautilusIconFactory is a class that knows how to hand out icons to be
* used for representing files and some other objects. It was designed
diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c
index ac8940d35..35f747167 100644
--- a/libnautilus-private/nautilus-icon-text-item.c
+++ b/libnautilus-private/nautilus-icon-text-item.c
@@ -1170,71 +1170,77 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
parent_class = gtk_type_class (gnome_canvas_item_get_type ());
- iti_signals [TEXT_CHANGED] = gtk_signal_new
+ iti_signals [TEXT_CHANGED] = g_signal_new
("text_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, text_changed),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, text_changed),
+ NULL, NULL,
gtk_marshal_BOOL__NONE,
GTK_TYPE_BOOL, 0);
- iti_signals [TEXT_EDITED] = gtk_signal_new
+ iti_signals [TEXT_EDITED] = g_signal_new
("text_edited",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, text_edited),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, text_edited),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- iti_signals [HEIGHT_CHANGED] = gtk_signal_new
+ iti_signals [HEIGHT_CHANGED] = g_signal_new
("height_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, height_changed),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, height_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- iti_signals [WIDTH_CHANGED] = gtk_signal_new
+ iti_signals [WIDTH_CHANGED] = g_signal_new
("width_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, width_changed),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, width_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- iti_signals[EDITING_STARTED] = gtk_signal_new
+ iti_signals[EDITING_STARTED] = g_signal_new
("editing_started",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, editing_started),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, editing_started),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- iti_signals[EDITING_STOPPED] = gtk_signal_new
+ iti_signals[EDITING_STOPPED] = g_signal_new
("editing_stopped",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, editing_stopped),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, editing_stopped),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- iti_signals[SELECTION_STARTED] = gtk_signal_new
+ iti_signals[SELECTION_STARTED] = g_signal_new
("selection_started",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, selection_started),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, selection_started),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- iti_signals[SELECTION_STOPPED] = gtk_signal_new
+ iti_signals[SELECTION_STOPPED] = g_signal_new
("selection_stopped",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusIconTextItemClass, selection_stopped),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusIconTextItemClass, selection_stopped),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, iti_signals, LAST_SIGNAL);
+ G_TYPE_NONE, 0);
object_class->destroy = iti_destroy;
object_class->set_arg = iti_set_arg;
diff --git a/libnautilus-private/nautilus-icon-text-item.h b/libnautilus-private/nautilus-icon-text-item.h
index e895acaed..dddd53794 100644
--- a/libnautilus-private/nautilus-icon-text-item.h
+++ b/libnautilus-private/nautilus-icon-text-item.h
@@ -11,9 +11,8 @@
#define NAUTILUS_ICON_TEXT_ITEM_H
#include <gtk/gtkeditable.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-icon-text.h>
+#include <libgnomecanvas/gnome-canvas.h>
+#include <libgnomecanvas/gnome-icon-text.h>
#define NAUTILUS_ICON_TEXT_ITEM(obj) (GTK_CHECK_CAST((obj), \
nautilus_icon_text_item_get_type (), NautilusIconTextItem))
diff --git a/libnautilus-private/nautilus-keep-last-vertical-box.c b/libnautilus-private/nautilus-keep-last-vertical-box.c
index a9036895b..eabdb9786 100644
--- a/libnautilus-private/nautilus-keep-last-vertical-box.c
+++ b/libnautilus-private/nautilus-keep-last-vertical-box.c
@@ -28,8 +28,8 @@
#include <eel/eel-gtk-macros.h>
-static void nautilus_keep_last_vertical_box_initialize_class (NautilusKeepLastVerticalBoxClass *class);
-static void nautilus_keep_last_vertical_box_initialize (NautilusKeepLastVerticalBox *box);
+static void nautilus_keep_last_vertical_box_class_init (NautilusKeepLastVerticalBoxClass *class);
+static void nautilus_keep_last_vertical_box_init (NautilusKeepLastVerticalBox *box);
static void nautilus_keep_last_vertical_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
@@ -37,7 +37,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_ve
/* Standard class initialization function */
static void
-nautilus_keep_last_vertical_box_initialize_class (NautilusKeepLastVerticalBoxClass *klass)
+nautilus_keep_last_vertical_box_class_init (NautilusKeepLastVerticalBoxClass *klass)
{
GtkWidgetClass *widget_class;
@@ -48,7 +48,7 @@ nautilus_keep_last_vertical_box_initialize_class (NautilusKeepLastVerticalBoxCla
/* Standard object initialization function */
static void
-nautilus_keep_last_vertical_box_initialize (NautilusKeepLastVerticalBox *box)
+nautilus_keep_last_vertical_box_init (NautilusKeepLastVerticalBox *box)
{
}
diff --git a/libnautilus-private/nautilus-link-desktop-file.c b/libnautilus-private/nautilus-link-desktop-file.c
index af2f0e92c..d852a485e 100644
--- a/libnautilus-private/nautilus-link-desktop-file.c
+++ b/libnautilus-private/nautilus-link-desktop-file.c
@@ -37,8 +37,8 @@
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
#include <eel/eel-xml-extensions.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-mime.h>
diff --git a/libnautilus-private/nautilus-link-desktop-file.h b/libnautilus-private/nautilus-link-desktop-file.h
index 4a4d8fb22..792b88c13 100644
--- a/libnautilus-private/nautilus-link-desktop-file.h
+++ b/libnautilus-private/nautilus-link-desktop-file.h
@@ -27,8 +27,6 @@
#include "nautilus-file.h"
#include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-dentry.h>
gboolean nautilus_link_desktop_file_local_create (const char *directory_path,
diff --git a/libnautilus-private/nautilus-link-historical.c b/libnautilus-private/nautilus-link-historical.c
index 4640f6600..b3dadc3d2 100644
--- a/libnautilus-private/nautilus-link-historical.c
+++ b/libnautilus-private/nautilus-link-historical.c
@@ -38,8 +38,8 @@
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
#include <eel/eel-xml-extensions.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-mime.h>
diff --git a/libnautilus-private/nautilus-link-historical.h b/libnautilus-private/nautilus-link-historical.h
index b181ec7af..b9781d04e 100644
--- a/libnautilus-private/nautilus-link-historical.h
+++ b/libnautilus-private/nautilus-link-historical.h
@@ -28,8 +28,6 @@
#include "nautilus-file.h"
#include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-dentry.h>
gboolean nautilus_link_historical_local_create (const char *directory_path,
const char *name,
diff --git a/libnautilus-private/nautilus-link.h b/libnautilus-private/nautilus-link.h
index a1864b91d..4fa6f7875 100644
--- a/libnautilus-private/nautilus-link.h
+++ b/libnautilus-private/nautilus-link.h
@@ -28,8 +28,6 @@
#include "nautilus-file.h"
#include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-dentry.h>
/* Link types */
typedef enum {
@@ -112,8 +110,11 @@ char * nautilus_link_get_link_name_given_file_contents (const char
int link_file_size);
char * nautilus_link_get_link_icon_given_file_contents (const char *file_contents,
int link_file_size);
+
+#ifdef GNOME2_CONVERSION_COMPLETE
void nautilus_link_local_create_from_gnome_entry (GnomeDesktopEntry *entry,
const char *dest_path,
const GdkPoint *position);
+#endif
#endif /* NAUTILUS_LINK_H */
diff --git a/libnautilus-private/nautilus-medusa-support.c b/libnautilus-private/nautilus-medusa-support.c
index 0af87810e..92f5d23e1 100644
--- a/libnautilus-private/nautilus-medusa-support.c
+++ b/libnautilus-private/nautilus-medusa-support.c
@@ -26,7 +26,6 @@
#include <config.h>
#include "nautilus-medusa-support.h"
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <eel/eel-glib-extensions.h>
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c
index 5cff8e9b0..c641c32ee 100644
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@@ -68,9 +68,9 @@ enum {
static guint signals[LAST_SIGNAL];
-static void nautilus_merged_directory_initialize (gpointer object,
+static void nautilus_merged_directory_init (gpointer object,
gpointer klass);
-static void nautilus_merged_directory_initialize_class (gpointer klass);
+static void nautilus_merged_directory_class_init (gpointer klass);
static void remove_all_real_directories (NautilusMergedDirectory *merged);
static guint merged_callback_hash (gconstpointer merged_callback);
static gboolean merged_callback_equal (gconstpointer merged_callback,
@@ -81,7 +81,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory,
NAUTILUS_TYPE_DIRECTORY)
static void
-nautilus_merged_directory_initialize (gpointer object, gpointer klass)
+nautilus_merged_directory_init (gpointer object, gpointer klass)
{
NautilusMergedDirectory *merged;
@@ -622,7 +622,7 @@ remove_all_real_directories (NautilusMergedDirectory *merged)
}
static void
-nautilus_merged_directory_initialize_class (gpointer klass)
+nautilus_merged_directory_class_init (gpointer klass)
{
GtkObjectClass *object_class;
NautilusDirectoryClass *directory_class;
@@ -647,21 +647,21 @@ nautilus_merged_directory_initialize_class (gpointer klass)
merged_directory_class->remove_real_directory = merged_remove_real_directory;
signals[ADD_REAL_DIRECTORY]
- = gtk_signal_new ("add_real_directory",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusMergedDirectoryClass,
+ = g_signal_new ("add_real_directory",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusMergedDirectoryClass,
add_real_directory),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[REMOVE_REAL_DIRECTORY]
- = gtk_signal_new ("remove_real_directory",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusMergedDirectoryClass,
+ = g_signal_new ("remove_real_directory",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusMergedDirectoryClass,
remove_real_directory),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
}
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index d5eb04488..df3deb6ac 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -1852,7 +1852,7 @@ metafile_read_done_callback (GnomeVFSResult result,
return;
}
- /* The gnome-xml parser requires a zero-terminated array. */
+ /* The libxml parser requires a zero-terminated array. */
buffer = g_realloc (file_contents, size + 1);
buffer[size] = '\0';
nautilus_metafile_set_metafile_contents (metafile,
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index 28bc9e44f..0728493aa 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -46,7 +46,7 @@ static gboolean string_not_in_list (const char
GList *list);
static char *mime_type_get_supertype (const char *mime_type);
static GList *get_explicit_content_view_iids_from_metafile (NautilusFile *file);
-static gboolean server_has_content_requirements (OAF_ServerInfo *server);
+static gboolean server_has_content_requirements (Bonobo_ServerInfo *server);
static gboolean application_supports_uri_scheme (gpointer data,
gpointer uri_scheme);
static GList *nautilus_do_component_query (const char *mime_type,
@@ -297,10 +297,10 @@ nautilus_mime_get_default_component_sort_conditions (NautilusFile *file, char *d
prev = sort_conditions[1];
if (p->next != NULL) {
- sort_conditions[1] = g_strconcat (prev, ((OAF_ServerInfo *) (p->data))->iid,
+ sort_conditions[1] = g_strconcat (prev, ((Bonobo_ServerInfo *) (p->data))->iid,
"','", NULL);
} else {
- sort_conditions[1] = g_strconcat (prev, ((OAF_ServerInfo *) (p->data))->iid,
+ sort_conditions[1] = g_strconcat (prev, ((Bonobo_ServerInfo *) (p->data))->iid,
"'])", NULL);
}
g_free (prev);
@@ -334,18 +334,18 @@ nautilus_mime_get_default_component_sort_conditions (NautilusFile *file, char *d
return sort_conditions;
}
-static OAF_ServerInfo *
+static Bonobo_ServerInfo *
nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
gboolean *user_chosen)
{
GList *info_list;
- OAF_ServerInfo *mime_default;
+ Bonobo_ServerInfo *mime_default;
char *default_component_string;
char *mime_type;
char *uri_scheme;
GList *item_mime_types;
GList *explicit_iids;
- OAF_ServerInfo *server;
+ Bonobo_ServerInfo *server;
char **sort_conditions;
char *extra_requirements;
gboolean used_user_chosen_info;
@@ -408,7 +408,7 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
}
if (info_list != NULL) {
- server = OAF_ServerInfo_duplicate (info_list->data);
+ server = Bonobo_ServerInfo_duplicate (info_list->data);
gnome_vfs_mime_component_list_free (info_list);
if (default_component_string != NULL && strcmp (server->iid, default_component_string) == 0) {
@@ -433,7 +433,7 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
}
-OAF_ServerInfo *
+Bonobo_ServerInfo *
nautilus_mime_get_default_component_for_file (NautilusFile *file)
{
return nautilus_mime_get_default_component_for_file_internal (file, NULL);
@@ -442,7 +442,7 @@ nautilus_mime_get_default_component_for_file (NautilusFile *file)
gboolean
nautilus_mime_is_default_component_for_file_user_chosen (NautilusFile *file)
{
- OAF_ServerInfo *component;
+ Bonobo_ServerInfo *component;
gboolean user_chosen;
component = nautilus_mime_get_default_component_for_file_internal (file, &user_chosen);
@@ -557,7 +557,7 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile *file)
GList *metadata_component_add_ids;
GList *metadata_component_remove_ids;
GList *p;
- OAF_ServerInfo *component;
+ Bonobo_ServerInfo *component;
GList *explicit_iids;
char *extra_sort_conditions[2];
char *extra_requirements;
@@ -589,7 +589,7 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile *file)
iids = NULL;
for (p = servers; p != NULL; p = p->next) {
- component = (OAF_ServerInfo *) p->data;
+ component = (Bonobo_ServerInfo *) p->data;
iids = g_list_prepend (iids, component->iid);
}
@@ -751,7 +751,7 @@ nautilus_mime_actions_file_needs_full_file_attributes (NautilusFile *file)
needs_full_attributes = FALSE;
for (p = info_list; p != NULL; p = p->next) {
- needs_full_attributes |= server_has_content_requirements ((OAF_ServerInfo *) (p->data));
+ needs_full_attributes |= server_has_content_requirements ((Bonobo_ServerInfo *) (p->data));
}
gnome_vfs_mime_component_list_free (info_list);
@@ -968,7 +968,7 @@ nautilus_mime_set_short_list_components_for_file (NautilusFile *file,
normal_short_list_ids = NULL;
for (p = normal_short_list; p != NULL; p = p->next) {
- normal_short_list_ids = g_list_prepend (normal_short_list_ids, ((OAF_ServerInfo *) p->data)->iid);
+ normal_short_list_ids = g_list_prepend (normal_short_list_ids, ((Bonobo_ServerInfo *) p->data)->iid);
}
/* compute delta */
@@ -1241,7 +1241,7 @@ get_explicit_content_view_iids_from_metafile (NautilusFile *file)
}
static char *
-make_oaf_query_for_explicit_content_view_iids (GList *view_iids)
+make_bonobo_activation_query_for_explicit_content_view_iids (GList *view_iids)
{
GList *p;
char *iid;
@@ -1278,7 +1278,7 @@ make_oaf_query_for_explicit_content_view_iids (GList *view_iids)
}
static char *
-make_oaf_query_with_known_mime_type (const char *mime_type,
+make_bonobo_activation_query_with_known_mime_type (const char *mime_type,
const char *uri_scheme,
GList *explicit_iids,
const char *extra_requirements)
@@ -1289,7 +1289,7 @@ make_oaf_query_with_known_mime_type (const char *mime_type,
mime_supertype = mime_type_get_supertype (mime_type);
- explicit_iid_query = make_oaf_query_for_explicit_content_view_iids (explicit_iids);
+ explicit_iid_query = make_bonobo_activation_query_for_explicit_content_view_iids (explicit_iids);
result = g_strdup_printf
(
@@ -1380,14 +1380,14 @@ make_oaf_query_with_known_mime_type (const char *mime_type,
}
static char *
-make_oaf_query_with_uri_scheme_only (const char *uri_scheme,
+make_bonobo_activation_query_with_uri_scheme_only (const char *uri_scheme,
GList *explicit_iids,
const char *extra_requirements)
{
char *result;
char *explicit_iid_query;
- explicit_iid_query = make_oaf_query_for_explicit_content_view_iids (explicit_iids);
+ explicit_iid_query = make_bonobo_activation_query_for_explicit_content_view_iids (explicit_iids);
result = g_strdup_printf
(
@@ -1495,11 +1495,11 @@ mime_type_hash_table_destroy (GHashTable *table)
static gboolean
-server_has_content_requirements (OAF_ServerInfo *server)
+server_has_content_requirements (Bonobo_ServerInfo *server)
{
OAF_Property *prop;
- prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
+ prop = bonobo_activation_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
if (prop == NULL || prop->v._d != OAF_P_STRINGV) {
return FALSE;
@@ -1509,7 +1509,7 @@ server_has_content_requirements (OAF_ServerInfo *server)
}
static gboolean
-server_matches_content_requirements (OAF_ServerInfo *server,
+server_matches_content_requirements (Bonobo_ServerInfo *server,
GHashTable *type_table,
GList *explicit_iids)
{
@@ -1525,7 +1525,7 @@ server_matches_content_requirements (OAF_ServerInfo *server,
if (!server_has_content_requirements (server)) {
return TRUE;
} else {
- prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
+ prop = bonobo_activation_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
types = prop->v._u.value_stringv;
@@ -1560,42 +1560,42 @@ nautilus_do_component_query (const char *mime_type,
char **extra_sort_criteria,
char *extra_requirements)
{
- OAF_ServerInfoList *oaf_result;
+ Bonobo_ServerInfoList *bonobo_activation_result;
char *query;
GList *retval;
char **all_sort_criteria;
CORBA_Environment ev;
- oaf_result = NULL;
+ bonobo_activation_result = NULL;
query = NULL;
if (is_known_mime_type (mime_type)) {
- query = make_oaf_query_with_known_mime_type (mime_type, uri_scheme, explicit_iids, extra_requirements);
+ query = make_bonobo_activation_query_with_known_mime_type (mime_type, uri_scheme, explicit_iids, extra_requirements);
} else {
- query = make_oaf_query_with_uri_scheme_only (uri_scheme, explicit_iids, extra_requirements);
+ query = make_bonobo_activation_query_with_uri_scheme_only (uri_scheme, explicit_iids, extra_requirements);
}
all_sort_criteria = strv_concat (extra_sort_criteria, nautilus_sort_criteria);
CORBA_exception_init (&ev);
- oaf_result = oaf_query (query, all_sort_criteria, &ev);
+ bonobo_activation_result = bonobo_activation_query (query, all_sort_criteria, &ev);
g_free (all_sort_criteria);
g_free (query);
retval = NULL;
- if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL && oaf_result->_length > 0) {
+ if (ev._major == CORBA_NO_EXCEPTION && bonobo_activation_result != NULL && bonobo_activation_result->_length > 0) {
GHashTable *content_types;
guint i;
content_types = mime_type_list_to_hash_table (item_mime_types);
- for (i = 0; i < oaf_result->_length; i++) {
- OAF_ServerInfo *server;
+ for (i = 0; i < bonobo_activation_result->_length; i++) {
+ Bonobo_ServerInfo *server;
- server = &oaf_result->_buffer[i];
+ server = &bonobo_activation_result->_buffer[i];
if (ignore_content_mime_types ||
server_matches_content_requirements (server, content_types, explicit_iids)) {
@@ -1605,7 +1605,7 @@ nautilus_do_component_query (const char *mime_type,
if (server->iid != NULL && strcmp (server->iid, "OAFIID:Bonobo_Sample_Text") != 0) {
retval = g_list_prepend
(retval,
- OAF_ServerInfo_duplicate (server));
+ Bonobo_ServerInfo_duplicate (server));
}
}
}
@@ -1613,7 +1613,7 @@ nautilus_do_component_query (const char *mime_type,
mime_type_hash_table_destroy (content_types);
}
- CORBA_free (oaf_result);
+ CORBA_free (bonobo_activation_result);
CORBA_exception_free (&ev);
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index a0155838a..6d679005d 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -35,7 +35,6 @@
#include <fam.h>
#include <gdk/gdk.h>
#include <gmodule.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-utils.h>
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index fb1d96c9a..49ba03218 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -42,9 +42,8 @@
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
enum {
@@ -146,7 +145,7 @@ program_file_pair_set_file (ProgramFilePair *pair, NautilusFile *file)
}
static ProgramFilePair *
-program_file_pair_new_from_content_view (OAF_ServerInfo *content_view, NautilusFile *file)
+program_file_pair_new_from_content_view (Bonobo_ServerInfo *content_view, NautilusFile *file)
{
ProgramFilePair *new_pair;
@@ -358,7 +357,7 @@ repopulate_program_list (GnomeDialog *program_chooser,
if (type == GNOME_VFS_MIME_ACTION_TYPE_COMPONENT) {
pair = program_file_pair_new_from_content_view
- ((OAF_ServerInfo *)program->data, file);
+ ((Bonobo_ServerInfo *)program->data, file);
} else {
pair = program_file_pair_new_from_application
((GnomeVFSMimeApplication *)program->data, file);
@@ -468,7 +467,7 @@ compare_mime_applications (GnomeVFSMimeApplication *app_1, GnomeVFSMimeApplicati
}
static gint
-compare_component_with_view (OAF_ServerInfo *info, NautilusViewIdentifier *identifier)
+compare_component_with_view (Bonobo_ServerInfo *info, NautilusViewIdentifier *identifier)
{
return strcmp (info->iid, identifier->iid);
}
@@ -492,7 +491,7 @@ is_application_default_for_type (GnomeVFSMimeApplication *application, const cha
static gboolean
is_component_default_for_type (NautilusViewIdentifier *identifier, const char *mime_type)
{
- OAF_ServerInfo *default_component;
+ Bonobo_ServerInfo *default_component;
gboolean result;
g_assert (identifier != NULL);
@@ -525,7 +524,7 @@ is_application_default_for_file (GnomeVFSMimeApplication *application,
static gboolean
is_component_default_for_file (NautilusViewIdentifier *identifier, NautilusFile *file)
{
- OAF_ServerInfo *default_component;
+ Bonobo_ServerInfo *default_component;
gboolean result;
g_assert (identifier != NULL);
diff --git a/libnautilus-private/nautilus-search-uri.c b/libnautilus-private/nautilus-search-uri.c
index 67337b2ac..7bfba1fd1 100644
--- a/libnautilus-private/nautilus-search-uri.c
+++ b/libnautilus-private/nautilus-search-uri.c
@@ -25,7 +25,6 @@
#include "nautilus-search-uri.h"
/* Must be included before other libgnome headers. */
-#include <libgnome/gnome-defs.h>
#include "nautilus-lib-self-check-functions.h"
#include <eel/eel-glib-extensions.h>
diff --git a/libnautilus-private/nautilus-sidebar-functions.c b/libnautilus-private/nautilus-sidebar-functions.c
index f456d6056..f691a8441 100644
--- a/libnautilus-private/nautilus-sidebar-functions.c
+++ b/libnautilus-private/nautilus-sidebar-functions.c
@@ -29,7 +29,7 @@
#include "nautilus-view-identifier.h"
#include <eel/eel-glib-extensions.h>
#include <eel/eel-string.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#define PREFERENCES_SIDEBAR_PANEL_PREFIX "sidebar-panels"
@@ -97,7 +97,7 @@ sidebar_get_sidebar_panel_view_identifiers (void)
{
CORBA_Environment ev;
const char *query;
- OAF_ServerInfoList *oaf_result;
+ Bonobo_ServerInfoList *bonobo_activation_result;
guint i;
NautilusViewIdentifier *id;
GList *view_identifiers;
@@ -106,21 +106,21 @@ sidebar_get_sidebar_panel_view_identifiers (void)
query = "nautilus:sidebar_panel_name.defined() AND repo_ids.has ('IDL:Bonobo/Control:1.0')";
- oaf_result = oaf_query (query, NULL, &ev);
+ bonobo_activation_result = bonobo_activation_query (query, NULL, &ev);
view_identifiers = NULL;
- if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL) {
- for (i = 0; i < oaf_result->_length; i++) {
+ if (ev._major == CORBA_NO_EXCEPTION && bonobo_activation_result != NULL) {
+ for (i = 0; i < bonobo_activation_result->_length; i++) {
id = nautilus_view_identifier_new_from_sidebar_panel
- (&oaf_result->_buffer[i]);
+ (&bonobo_activation_result->_buffer[i]);
view_identifiers = g_list_prepend (view_identifiers, id);
}
view_identifiers = g_list_reverse (view_identifiers);
}
- if (oaf_result != NULL) {
- CORBA_free (oaf_result);
+ if (bonobo_activation_result != NULL) {
+ CORBA_free (bonobo_activation_result);
}
CORBA_exception_free (&ev);
diff --git a/libnautilus-private/nautilus-sound.c b/libnautilus-private/nautilus-sound.c
index 618d32747..22920a940 100644
--- a/libnautilus-private/nautilus-sound.c
+++ b/libnautilus-private/nautilus-sound.c
@@ -64,7 +64,7 @@ kill_sound_if_necessary (void)
/* initialize_sound is called at application start up time. It puts the sound system
into a quiescent state */
void
-nautilus_sound_initialize (void)
+nautilus_sound_init (void)
{
eel_gconf_set_integer (CURRENT_SOUND_STATE_KEY, 0);
eel_gconf_suggest_sync ();
@@ -96,7 +96,7 @@ nautilus_sound_register_sound (pid_t sound_process)
/* This function does two things. First it checks to see a sound is currently playing. If it is,
* it returns the process id of the external application playing the sound. If no sound is playing,
- * it return the value set in nautilus_sound_initialize() when system audio output capabilites
+ * it return the value set in nautilus_sound_init() when system audio output capabilites
* were queried.
*/
gboolean
diff --git a/libnautilus-private/nautilus-sound.h b/libnautilus-private/nautilus-sound.h
index 3083c32a9..f71694809 100644
--- a/libnautilus-private/nautilus-sound.h
+++ b/libnautilus-private/nautilus-sound.h
@@ -28,7 +28,7 @@
#include <glib.h>
#include <sys/wait.h>
-void nautilus_sound_initialize (void);
+void nautilus_sound_init (void);
gboolean nautilus_sound_can_play_sound (void);
void nautilus_sound_kill_sound (void);
void nautilus_sound_register_sound (pid_t sound_process);
diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c
index 1c1492f4f..cfcd50304 100644
--- a/libnautilus-private/nautilus-theme.c
+++ b/libnautilus-private/nautilus-theme.c
@@ -37,7 +37,6 @@
#include <eel/eel-xml-extensions.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-util.h>
@@ -338,7 +337,7 @@ nautilus_theme_make_preview_pixbuf (const char *theme_name)
pixbuf_file = nautilus_pixmap_file (theme_preview_name);
if (pixbuf_file != NULL) {
- pixbuf = gdk_pixbuf_new_from_file (pixbuf_file);
+ pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL);
g_free (pixbuf_file);
return pixbuf;
} else {
@@ -348,7 +347,7 @@ nautilus_theme_make_preview_pixbuf (const char *theme_name)
g_free (user_themes_directory);
if (g_file_exists (pixbuf_file)) {
- pixbuf = gdk_pixbuf_new_from_file (pixbuf_file);
+ pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL);
g_free (pixbuf_file);
return pixbuf;
} else {
@@ -406,7 +405,7 @@ nautilus_theme_make_preview_pixbuf (const char *theme_name)
}
} else {
- pixbuf = gdk_pixbuf_new_from_file (pixbuf_file);
+ pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL);
}
g_free (pixbuf_file);
diff --git a/libnautilus-private/nautilus-thumbnails-jpeg.c b/libnautilus-private/nautilus-thumbnails-jpeg.c
index d4f1bf11b..0afea9e90 100644
--- a/libnautilus-private/nautilus-thumbnails-jpeg.c
+++ b/libnautilus-private/nautilus-thumbnails-jpeg.c
@@ -83,7 +83,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
src = (Source *) cinfo->src;
result = gnome_vfs_read (src->handle,
src->buffer,
- EEL_N_ELEMENTS (src->buffer),
+ G_N_ELEMENTS (src->buffer),
&nbytes);
if (result != GNOME_VFS_OK || nbytes == 0) {
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index 83b233865..2df7d4526 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -687,7 +687,7 @@ nautilus_thumbnail_load_framed_image (const char *path, gboolean anti_aliased_fr
int left_offset, top_offset, right_offset, bottom_offset;
char c;
- pixbuf = gdk_pixbuf_new_from_file (path);
+ pixbuf = gdk_pixbuf_new_from_file (path, NULL);
if (pixbuf == NULL || pixbuf_is_framed (pixbuf)) {
return pixbuf;
}
diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c
index 95297faff..6c80505fc 100644
--- a/libnautilus-private/nautilus-trash-directory.c
+++ b/libnautilus-private/nautilus-trash-directory.c
@@ -35,7 +35,6 @@
#include "nautilus-volume-monitor.h"
#include <gtk/gtksignal.h>
#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
struct NautilusTrashDirectoryDetails {
@@ -50,9 +49,9 @@ typedef struct {
NautilusDirectory *real_directory;
} TrashVolume;
-static void nautilus_trash_directory_initialize (gpointer object,
+static void nautilus_trash_directory_init (gpointer object,
gpointer klass);
-static void nautilus_trash_directory_initialize_class (gpointer klass);
+static void nautilus_trash_directory_class_init (gpointer klass);
static void add_volume (NautilusTrashDirectory *trash,
NautilusVolume *volume);
@@ -305,7 +304,7 @@ volume_mounted_callback (NautilusVolumeMonitor *monitor,
}
static void
-nautilus_trash_directory_initialize (gpointer object, gpointer klass)
+nautilus_trash_directory_init (gpointer object, gpointer klass)
{
NautilusTrashDirectory *trash;
NautilusVolumeMonitor *volume_monitor;
@@ -326,7 +325,7 @@ nautilus_trash_directory_initialize (gpointer object, gpointer klass)
}
/* Finish initializing a new NautilusTrashDirectory. We have to do the
- * remaining initialization here rather than in nautilus_trash_directory_initialize
+ * remaining initialization here rather than in nautilus_trash_directory_init
* because of a cyclic dependency between the NautilusTrashDirectory and
* NautilusTrashMonitor instances.
*/
@@ -389,7 +388,7 @@ trash_get_name_for_self_as_new_file (NautilusDirectory *directory)
}
static void
-nautilus_trash_directory_initialize_class (gpointer klass)
+nautilus_trash_directory_class_init (gpointer klass)
{
GtkObjectClass *object_class;
NautilusDirectoryClass *directory_class;
diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c
index b51849bb9..cb0070dc2 100644
--- a/libnautilus-private/nautilus-trash-file.c
+++ b/libnautilus-private/nautilus-trash-file.c
@@ -35,7 +35,6 @@
#include <eel/eel-gtk-macros.h>
#include "nautilus-trash-directory.h"
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <string.h>
@@ -77,9 +76,9 @@ static const char * const delegated_attributes[] = {
NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES
};
-static void nautilus_trash_file_initialize (gpointer object,
+static void nautilus_trash_file_init (gpointer object,
gpointer klass);
-static void nautilus_trash_file_initialize_class (gpointer klass);
+static void nautilus_trash_file_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashFile,
nautilus_trash_file,
@@ -92,7 +91,7 @@ is_delegated_attribute (const char *attribute)
g_return_val_if_fail (attribute != NULL, FALSE);
- for (i = 0; i < EEL_N_ELEMENTS (delegated_attributes); i++) {
+ for (i = 0; i < G_N_ELEMENTS (delegated_attributes); i++) {
if (strcmp (attribute, delegated_attributes[i]) == 0) {
return TRUE;
}
@@ -735,7 +734,7 @@ remove_all_real_files (NautilusTrashFile *trash)
}
static void
-nautilus_trash_file_initialize (gpointer object, gpointer klass)
+nautilus_trash_file_init (gpointer object, gpointer klass)
{
NautilusTrashFile *trash_file;
NautilusTrashDirectory *trash_directory;
@@ -805,7 +804,7 @@ trash_destroy (GtkObject *object)
}
static void
-nautilus_trash_file_initialize_class (gpointer klass)
+nautilus_trash_file_class_init (gpointer klass)
{
GtkObjectClass *object_class;
NautilusFileClass *file_class;
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 64da6584d..a53c3dc33 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -51,15 +51,15 @@ enum {
static guint signals[LAST_SIGNAL];
static NautilusTrashMonitor *nautilus_trash_monitor;
-static void nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass);
-static void nautilus_trash_monitor_initialize (gpointer object,
+static void nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass);
+static void nautilus_trash_monitor_init (gpointer object,
gpointer klass);
static void destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
static void
-nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass)
+nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass)
{
GtkObjectClass *object_class;
@@ -67,25 +67,25 @@ nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass)
object_class->destroy = destroy;
- signals[TRASH_STATE_CHANGED] = gtk_signal_new
+ signals[TRASH_STATE_CHANGED] = g_signal_new
("trash_state_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusTrashMonitorClass, trash_state_changed),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusTrashMonitorClass, trash_state_changed),
+ NULL, NULL,
gtk_marshal_NONE__BOOL,
- GTK_TYPE_NONE, 1,
+ G_TYPE_NONE, 1,
GTK_TYPE_BOOL);
- signals[CHECK_TRASH_DIRECTORY_ADDED] = gtk_signal_new
+ signals[CHECK_TRASH_DIRECTORY_ADDED] = g_signal_new
("check_trash_directory_added",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusTrashMonitorClass, check_trash_directory_added),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusTrashMonitorClass, check_trash_directory_added),
+ NULL, NULL,
gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
+ G_TYPE_NONE, 1,
GTK_TYPE_POINTER);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
}
static void
@@ -119,7 +119,7 @@ nautilus_trash_files_changed_callback (NautilusDirectory *directory, GList *file
}
static void
-nautilus_trash_monitor_initialize (gpointer object, gpointer klass)
+nautilus_trash_monitor_init (gpointer object, gpointer klass)
{
NautilusDirectory *trash_directory;
NautilusTrashMonitor *trash_monitor;
diff --git a/libnautilus-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c
index 279d010b9..d12c34ce8 100644
--- a/libnautilus-private/nautilus-undo-context.c
+++ b/libnautilus-private/nautilus-undo-context.c
@@ -37,8 +37,8 @@ typedef struct {
} impl_POA_Nautilus_Undo_Context;
/* GtkObject */
-static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class);
-static void nautilus_undo_context_initialize (NautilusUndoContext *item);
+static void nautilus_undo_context_class_init (NautilusUndoContextClass *class);
+static void nautilus_undo_context_init (NautilusUndoContext *item);
static void destroy (GtkObject *object);
/* CORBA/Bonobo */
@@ -128,7 +128,7 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager)
}
static void
-nautilus_undo_context_initialize (NautilusUndoContext *context)
+nautilus_undo_context_init (NautilusUndoContext *context)
{
CORBA_Environment ev;
@@ -157,7 +157,7 @@ destroy (GtkObject *object)
}
static void
-nautilus_undo_context_initialize_class (NautilusUndoContextClass *klass)
+nautilus_undo_context_class_init (NautilusUndoContextClass *klass)
{
GTK_OBJECT_CLASS (klass)->destroy = destroy;
}
diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c
index ea92de5e0..d82a6210f 100644
--- a/libnautilus-private/nautilus-undo-manager.c
+++ b/libnautilus-private/nautilus-undo-manager.c
@@ -68,8 +68,8 @@ typedef struct {
} UndoMenuHandlerConnection;
/* GtkObject */
-static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
-static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
+static void nautilus_undo_manager_class_init (NautilusUndoManagerClass *class);
+static void nautilus_undo_manager_init (NautilusUndoManager *item);
static void destroy (GtkObject *object);
/* CORBA/Bonobo */
@@ -237,7 +237,7 @@ nautilus_undo_manager_new (void)
}
static void
-nautilus_undo_manager_initialize (NautilusUndoManager *manager)
+nautilus_undo_manager_init (NautilusUndoManager *manager)
{
CORBA_Environment ev;
@@ -252,7 +252,7 @@ nautilus_undo_manager_initialize (NautilusUndoManager *manager)
}
static void
-nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass)
+nautilus_undo_manager_class_init (NautilusUndoManagerClass *klass)
{
GtkObjectClass *object_class;
@@ -262,16 +262,15 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass)
object_class->destroy = destroy;
- signals[CHANGED] = gtk_signal_new
+ signals[CHANGED] = g_signal_new
("changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusUndoManagerClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusUndoManagerClass,
changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ G_TYPE_NONE, 0);
}
void
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c
index 6cd4ab129..2d708b312 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.c
+++ b/libnautilus-private/nautilus-undo-signal-handlers.c
@@ -26,7 +26,6 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libnautilus/nautilus-undo.h>
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index e8446a8d2..d209c040c 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -34,16 +34,16 @@ struct NautilusVFSDirectoryDetails {
char dummy; /* ANSI C does not allow empty structs */
};
-static void nautilus_vfs_directory_initialize (gpointer object,
+static void nautilus_vfs_directory_init (gpointer object,
gpointer klass);
-static void nautilus_vfs_directory_initialize_class (gpointer klass);
+static void nautilus_vfs_directory_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSDirectory,
nautilus_vfs_directory,
NAUTILUS_TYPE_DIRECTORY)
static void
-nautilus_vfs_directory_initialize (gpointer object, gpointer klass)
+nautilus_vfs_directory_init (gpointer object, gpointer klass)
{
NautilusVFSDirectory *directory;
@@ -179,7 +179,7 @@ vfs_is_not_empty (NautilusDirectory *directory)
}
static void
-nautilus_vfs_directory_initialize_class (gpointer klass)
+nautilus_vfs_directory_class_init (gpointer klass)
{
GtkObjectClass *object_class;
NautilusDirectoryClass *directory_class;
diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c
index 0a0e42e36..92ec388c7 100644
--- a/libnautilus-private/nautilus-vfs-file.c
+++ b/libnautilus-private/nautilus-vfs-file.c
@@ -34,9 +34,9 @@ struct NautilusVFSFileDetails {
char dummy; /* ANSI C does not allow empty structs */
};
-static void nautilus_vfs_file_initialize (gpointer object,
+static void nautilus_vfs_file_init (gpointer object,
gpointer klass);
-static void nautilus_vfs_file_initialize_class (gpointer klass);
+static void nautilus_vfs_file_class_init (gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSFile,
nautilus_vfs_file,
@@ -233,7 +233,7 @@ vfs_file_get_where_string (NautilusFile *file)
}
static void
-nautilus_vfs_file_initialize (gpointer object, gpointer klass)
+nautilus_vfs_file_init (gpointer object, gpointer klass)
{
NautilusVFSFile *file;
@@ -255,7 +255,7 @@ vfs_destroy (GtkObject *object)
}
static void
-nautilus_vfs_file_initialize_class (gpointer klass)
+nautilus_vfs_file_class_init (gpointer klass)
{
GtkObjectClass *object_class;
NautilusFileClass *file_class;
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");
}
diff --git a/libnautilus-private/nautilus-view-identifier.h b/libnautilus-private/nautilus-view-identifier.h
index e2d7d05a9..d4f4d84ca 100644
--- a/libnautilus-private/nautilus-view-identifier.h
+++ b/libnautilus-private/nautilus-view-identifier.h
@@ -25,7 +25,7 @@
#ifndef NAUTILUS_VIEW_IDENTIFIER_H
#define NAUTILUS_VIEW_IDENTIFIER_H
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
typedef struct {
char *iid; /* Unique ID */
@@ -34,17 +34,17 @@ typedef struct {
char *viewer_label; /* "<name> Viewer" */
} NautilusViewIdentifier;
-NautilusViewIdentifier *nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server,
- char *name_attribute);
-NautilusViewIdentifier *nautilus_view_identifier_new_from_content_view (OAF_ServerInfo *server);
-NautilusViewIdentifier *nautilus_view_identifier_new_from_sidebar_panel (OAF_ServerInfo *server);
-NautilusViewIdentifier *nautilus_view_identifier_new_from_property_page (OAF_ServerInfo *server);
-NautilusViewIdentifier *nautilus_view_identifier_copy (const NautilusViewIdentifier *identifier);
-void nautilus_view_identifier_free (NautilusViewIdentifier *identifier);
-int nautilus_view_identifier_compare (const NautilusViewIdentifier *a,
- const NautilusViewIdentifier *b);
+NautilusViewIdentifier *nautilus_view_identifier_new_from_bonobo_activation_server_info (Bonobo_ServerInfo *server,
+ char *name_attribute);
+NautilusViewIdentifier *nautilus_view_identifier_new_from_content_view (Bonobo_ServerInfo *server);
+NautilusViewIdentifier *nautilus_view_identifier_new_from_sidebar_panel (Bonobo_ServerInfo *server);
+NautilusViewIdentifier *nautilus_view_identifier_new_from_property_page (Bonobo_ServerInfo *server);
+NautilusViewIdentifier *nautilus_view_identifier_copy (const NautilusViewIdentifier *identifier);
+void nautilus_view_identifier_free (NautilusViewIdentifier *identifier);
+int nautilus_view_identifier_compare (const NautilusViewIdentifier *a,
+ const NautilusViewIdentifier *b);
/* lists of NautilusViewIdentifier */
-GList * nautilus_view_identifier_list_copy (GList *list);
-void nautilus_view_identifier_list_free (GList *list);
+GList * nautilus_view_identifier_list_copy (GList *list);
+void nautilus_view_identifier_list_free (GList *list);
#endif /* NAUTILUS_VIEW_IDENTIFIER */
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index 575ad6c7a..c637ac828 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -46,7 +46,6 @@
#include <libxml/tree.h>
#include <gtk/gtkmain.h>
#include <libgnome/gnome-config.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
@@ -194,8 +193,8 @@ enum {
static guint signals[LAST_SIGNAL];
-static void nautilus_volume_monitor_initialize (NautilusVolumeMonitor *desktop_mounter);
-static void nautilus_volume_monitor_initialize_class (NautilusVolumeMonitorClass *klass);
+static void nautilus_volume_monitor_init (NautilusVolumeMonitor *desktop_mounter);
+static void nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass);
static void nautilus_volume_monitor_destroy (GtkObject *object);
static char * get_iso9660_volume_name (NautilusVolume *volume,
int volume_fd);
@@ -251,7 +250,7 @@ load_file_system_table (void)
return table;
}
- for (node = doc->xmlRootNode->xmlChildrenNode; node != NULL; node = node->next) {
+ for (node = doc->children->children; node != NULL; node = node->next) {
name = xmlGetProp (node, "name");
if (name != NULL) {
@@ -280,7 +279,7 @@ load_file_system_table (void)
}
static void
-nautilus_volume_monitor_initialize (NautilusVolumeMonitor *monitor)
+nautilus_volume_monitor_init (NautilusVolumeMonitor *monitor)
{
/* Set up details */
monitor->details = g_new0 (NautilusVolumeMonitorDetails, 1);
@@ -291,7 +290,7 @@ nautilus_volume_monitor_initialize (NautilusVolumeMonitor *monitor)
}
static void
-nautilus_volume_monitor_initialize_class (NautilusVolumeMonitorClass *klass)
+nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
{
GtkObjectClass *object_class;
@@ -300,42 +299,44 @@ nautilus_volume_monitor_initialize_class (NautilusVolumeMonitorClass *klass)
object_class->destroy = nautilus_volume_monitor_destroy;
signals[VOLUME_MOUNTED]
- = gtk_signal_new ("volume_mounted",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusVolumeMonitorClass,
+ = g_signal_new ("volume_mounted",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_mounted),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[VOLUME_UNMOUNT_STARTED]
- = gtk_signal_new ("volume_unmount_started",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusVolumeMonitorClass,
+ = g_signal_new ("volume_unmount_started",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_unmount_started),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[VOLUME_UNMOUNT_FAILED]
- = gtk_signal_new ("volume_unmount_failed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusVolumeMonitorClass,
+ = g_signal_new ("volume_unmount_failed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_unmount_failed),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[VOLUME_UNMOUNTED]
- = gtk_signal_new ("volume_unmounted",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusVolumeMonitorClass,
+ = g_signal_new ("volume_unmounted",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_unmounted),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
/* Check environment a bit. */
if (g_file_exists ("/vol/dev")) {
diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am
index 5c40bc7a6..d47757469 100644
--- a/libnautilus/Makefile.am
+++ b/libnautilus/Makefile.am
@@ -30,7 +30,6 @@ libnautilusincludedir=$(includedir)/libnautilus
libnautilusinclude_HEADERS= \
libnautilus.h \
nautilus-bonobo-ui.h \
- nautilus-bonobo-workarounds.h \
nautilus-clipboard.h \
nautilus-distributed-undo.h \
nautilus-idle-queue.h \
@@ -44,7 +43,6 @@ libnautilusinclude_HEADERS= \
libnautilus_la_SOURCES= \
$(nautilus_view_component_idl_sources) \
$(nautilus_distributed_undo_idl_sources) \
- nautilus-bonobo-workarounds.c \
nautilus-clipboard.c \
nautilus-idle-queue.c \
nautilus-undo-transaction.c \
diff --git a/libnautilus/nautilus-undo-transaction.c b/libnautilus/nautilus-undo-transaction.c
index ac2e019f1..f0b8484dd 100644
--- a/libnautilus/nautilus-undo-transaction.c
+++ b/libnautilus/nautilus-undo-transaction.c
@@ -31,7 +31,6 @@
#include <bonobo/bonobo-main.h>
#include <gtk/gtksignal.h>
#include <eel/eel-gtk-macros.h>
-#include <libnautilus/nautilus-bonobo-workarounds.h>
#define NAUTILUS_UNDO_TRANSACTION_LIST_DATA "Nautilus undo transaction list"
@@ -40,8 +39,8 @@ typedef struct {
NautilusUndoTransaction *bonobo_object;
} impl_POA_Nautilus_Undo_Transaction;
-static void nautilus_undo_transaction_initialize_class (NautilusUndoTransactionClass *class);
-static void nautilus_undo_transaction_initialize (NautilusUndoTransaction *item);
+static void nautilus_undo_transaction_class_init (NautilusUndoTransactionClass *class);
+static void nautilus_undo_transaction_init (NautilusUndoTransaction *item);
static void nautilus_undo_transaction_destroy (GtkObject *object);
static void nautilus_undo_transaction_undo (NautilusUndoTransaction *transaction);
@@ -59,64 +58,7 @@ static void impl_Nautilus_Undo_Transaction__undo
static void undo_atom_list_free (GList *list);
static void undo_atom_list_undo_and_free (GList *list);
-EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoTransaction, nautilus_undo_transaction, BONOBO_OBJECT_TYPE)
-
-static POA_Nautilus_Undo_Transaction__epv libnautilus_Nautilus_Undo_Transaction_epv =
-{
- NULL,
- &impl_Nautilus_Undo_Transaction__get_undo_menu_item,
- &impl_Nautilus_Undo_Transaction__get_redo_menu_item,
- &impl_Nautilus_Undo_Transaction__get_operation_name,
- &impl_Nautilus_Undo_Transaction__undo
-};
-
-static PortableServer_ServantBase__epv base_epv;
-static POA_Nautilus_Undo_Transaction__vepv vepv =
-{
- &base_epv,
- NULL,
- &libnautilus_Nautilus_Undo_Transaction_epv
-};
-
-static void
-impl_Nautilus_Undo_Transaction__destroy (BonoboObject *object,
- PortableServer_Servant servant)
-{
- PortableServer_ObjectId *object_id;
- CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
-
- object_id = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev);
- PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
- CORBA_free (object_id);
- object->servant = NULL;
-
- POA_Nautilus_Undo_Transaction__fini (servant, &ev);
- g_free (servant);
-
- CORBA_exception_free (&ev);
-}
-
-static Nautilus_Undo_Transaction
-impl_Nautilus_Undo_Transaction__create (NautilusUndoTransaction *bonobo_object,
- CORBA_Environment *ev)
-{
- impl_POA_Nautilus_Undo_Transaction *servant;
-
- servant = g_new0 (impl_POA_Nautilus_Undo_Transaction, 1);
-
- vepv.Bonobo_Unknown_epv = nautilus_bonobo_object_get_epv ();
- servant->servant.vepv = &vepv;
- POA_Nautilus_Undo_Transaction__init ((PortableServer_Servant) servant, ev);
-
- gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy",
- GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Transaction__destroy),
- servant);
-
- servant->bonobo_object = bonobo_object;
- return bonobo_object_activate_servant (BONOBO_OBJECT (bonobo_object), servant);
-}
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoTransaction, nautilus_undo_transaction, BONOBO_OBJECT_TYPE)
static Nautilus_Undo_MenuItem *
impl_Nautilus_Undo_Transaction__get_undo_menu_item (PortableServer_Servant servant,
@@ -193,14 +135,8 @@ nautilus_undo_transaction_new (const char *operation_name,
}
static void
-nautilus_undo_transaction_initialize (NautilusUndoTransaction *transaction)
+nautilus_undo_transaction_init (NautilusUndoTransaction *transaction)
{
- CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
- bonobo_object_construct (BONOBO_OBJECT (transaction),
- impl_Nautilus_Undo_Transaction__create (transaction, &ev));
- CORBA_exception_free (&ev);
}
@@ -258,9 +194,16 @@ nautilus_undo_transaction_destroy (GtkObject *object)
}
static void
-nautilus_undo_transaction_initialize_class (NautilusUndoTransactionClass *klass)
+nautilus_undo_transaction_class_init (NautilusUndoTransactionClass *klass)
{
+ POA_Nautilus_Undo_Transaction__epv *epv = &klass->epv;
+
GTK_OBJECT_CLASS (klass)->destroy = nautilus_undo_transaction_destroy;
+
+ epv->_get_undo_menu_item = &impl_Nautilus_Undo_Transaction__get_undo_menu_item;
+ epv->_get_redo_menu_item = &impl_Nautilus_Undo_Transaction__get_redo_menu_item;
+ epv->_get_operation_name = &impl_Nautilus_Undo_Transaction__get_operation_name;
+ epv->undo = &impl_Nautilus_Undo_Transaction__undo;
}
void
diff --git a/libnautilus/nautilus-undo-transaction.h b/libnautilus/nautilus-undo-transaction.h
index 76564b3c7..0c51303c1 100644
--- a/libnautilus/nautilus-undo-transaction.h
+++ b/libnautilus/nautilus-undo-transaction.h
@@ -56,6 +56,7 @@ typedef struct {
typedef struct {
BonoboObjectClass parent_slot;
+ POA_Nautilus_Undo_Transaction__epv epv;
} NautilusUndoTransactionClass;
GtkType nautilus_undo_transaction_get_type (void);
diff --git a/libnautilus/nautilus-undo.c b/libnautilus/nautilus-undo.c
index 66a618137..088fa0957 100644
--- a/libnautilus/nautilus-undo.c
+++ b/libnautilus/nautilus-undo.c
@@ -253,7 +253,7 @@ set_up_bonobo_control (BonoboControl *control)
CORBA_exception_init (&ev);
/* Find the undo manager. */
- control_frame = bonobo_control_get_control_frame (control);
+ control_frame = bonobo_control_get_control_frame (control, &ev);
if (!CORBA_Object_is_nil (control_frame, &ev)) {
undo_context = Bonobo_Control_queryInterface
(control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev);
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c
index c4ef56367..19ad0619a 100644
--- a/libnautilus/nautilus-view-standard-main.c
+++ b/libnautilus/nautilus-view-standard-main.c
@@ -30,15 +30,16 @@
#include <config.h>
#include "nautilus-view-standard-main.h"
+#include <X11/Xlib.h>
#include <bonobo/bonobo-generic-factory.h>
#include <bonobo/bonobo-main.h>
+#include <gdk/gdkx.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
#include <stdlib.h>
+#include <string.h>
#define N_IDLE_SECONDS_BEFORE_QUIT 5
@@ -109,7 +110,7 @@ make_object (BonoboGenericFactory *factory,
callback_data->delayed_quit_timeout_id = 0;
}
gtk_signal_connect (GTK_OBJECT (view), "destroy",
- object_destroyed, callback_data);
+ G_CALLBACK (object_destroyed), callback_data);
return BONOBO_OBJECT (view);
}
@@ -184,18 +185,25 @@ nautilus_view_standard_main_multi (const char *executable_name,
}
#endif
+#if GNOME2_CONVERSION_COMPLETE
/* Disable session manager connection */
gnome_client_disable_master_connection ();
+#endif
- gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
- orb = oaf_init (argc, argv);
+#if GNOME2_CONVERSION_COMPLETE
+ gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
+#endif
+ orb = bonobo_activation_init (argc, argv);
/* Initialize libraries. */
+#if GNOME2_CONVERSION_COMPLETE
gnome_init (executable_name, version, argc, argv);
- gdk_rgb_init ();
+#endif
g_thread_init (NULL);
gnome_vfs_init ();
+#if GNOME2_CONVERSION_COMPLETE
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
+#endif
if (post_initialize_callback != NULL) {
(* post_initialize_callback) ();
@@ -209,11 +217,11 @@ nautilus_view_standard_main_multi (const char *executable_name,
callback_data.delayed_quit_timeout_id = 0;
/* Create the factory. */
- registration_id = oaf_make_registration_id (factory_iid,
+ registration_id = bonobo_activation_make_registration_id (factory_iid,
DisplayString (GDK_DISPLAY ()));
- factory = bonobo_generic_factory_new_multi (registration_id,
- make_object,
- &callback_data);
+ factory = bonobo_generic_factory_new (registration_id,
+ make_object,
+ &callback_data);
g_free (registration_id);
/* Loop until we have no more objects. */
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 1eaf42ed9..2a7ad8c23 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -32,7 +32,6 @@
#include <config.h>
#include "nautilus-view.h"
-#include "nautilus-bonobo-workarounds.h"
#include "nautilus-idle-queue.h"
#include "nautilus-undo.h"
#include <bonobo/bonobo-control.h>
@@ -76,7 +75,7 @@ typedef struct {
} LocationPlus;
static void impl_Nautilus_View_load_location (PortableServer_Servant servant,
- CORBA_char *location,
+ const CORBA_char *location,
CORBA_Environment *ev);
static void impl_Nautilus_View_stop_loading (PortableServer_Servant servant,
CORBA_Environment *ev);
@@ -89,30 +88,12 @@ static void impl_Nautilus_View_title_changed (PortableServer_Servant servan
static void impl_Nautilus_View_history_changed (PortableServer_Servant servant,
const Nautilus_History *history,
CORBA_Environment *ev);
-static void nautilus_view_initialize (NautilusView *view);
+static void nautilus_view_init (NautilusView *view);
static void nautilus_view_destroy (GtkObject *object);
-static void nautilus_view_initialize_class (NautilusViewClass *klass);
+static void nautilus_view_class_init (NautilusViewClass *klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE)
-static POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
-{
- NULL,
- impl_Nautilus_View_load_location,
- impl_Nautilus_View_stop_loading,
- impl_Nautilus_View_selection_changed,
- impl_Nautilus_View_title_changed,
- impl_Nautilus_View_history_changed
-};
-
-static PortableServer_ServantBase__epv base_epv;
-static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
-{
- &base_epv,
- NULL,
- &libnautilus_Nautilus_View_epv
-};
-
static void
queue_incoming_call (PortableServer_Servant servant,
ViewFunction call,
@@ -257,7 +238,7 @@ history_dup (const Nautilus_History *history)
static void
impl_Nautilus_View_load_location (PortableServer_Servant servant,
- CORBA_char *location,
+ const CORBA_char *location,
CORBA_Environment *ev)
{
queue_incoming_call (servant,
@@ -310,108 +291,70 @@ impl_Nautilus_View_history_changed (PortableServer_Servant servant,
}
static void
-impl_Nautilus_View__destroy (BonoboObject *object,
- PortableServer_Servant servant)
-{
- PortableServer_ObjectId *object_id;
- CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
-
- object_id = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev);
- PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
- CORBA_free (object_id);
-
- object->servant = NULL;
-
- POA_Nautilus_View__fini (servant, &ev);
- g_free (servant);
-
- CORBA_exception_free (&ev);
-}
-
-static Nautilus_ViewFrame
-impl_Nautilus_View__create (NautilusView *bonobo_object,
- CORBA_Environment * ev)
-{
- impl_POA_Nautilus_View *servant;
-
- impl_Nautilus_View_vepv.Bonobo_Unknown_epv = nautilus_bonobo_object_get_epv ();
-
- servant = g_new0 (impl_POA_Nautilus_View, 1);
- servant->servant.vepv = &impl_Nautilus_View_vepv;
- POA_Nautilus_View__init ((PortableServer_Servant) servant, ev);
-
- gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy",
- GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), servant);
-
- servant->bonobo_object = bonobo_object;
- return bonobo_object_activate_servant (BONOBO_OBJECT (bonobo_object), servant);
-}
-
-static void
-nautilus_view_initialize_class (NautilusViewClass *klass)
+nautilus_view_class_init (NautilusViewClass *klass)
{
GtkObjectClass *object_class;
+ POA_Nautilus_View__epv *epv = &klass->epv;
- object_class = (GtkObjectClass*) klass;
+ object_class = (GtkObjectClass *) klass;
object_class->destroy = nautilus_view_destroy;
signals[LOAD_LOCATION] =
- gtk_signal_new ("load_location",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewClass, load_location),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
+ g_signal_new ("load_location",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewClass, load_location),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
signals[STOP_LOADING] =
- gtk_signal_new ("stop_loading",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewClass, stop_loading),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("stop_loading",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewClass, stop_loading),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewClass, selection_changed),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_signal_new ("selection_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewClass, selection_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[TITLE_CHANGED] =
- gtk_signal_new ("title_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewClass, title_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
+ g_signal_new ("title_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewClass, title_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
signals[HISTORY_CHANGED] =
- gtk_signal_new ("history_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewClass, history_changed),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ g_signal_new ("history_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewClass, history_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__POINTER,
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+
+ epv->load_location = impl_Nautilus_View_load_location;
+ epv->stop_loading = impl_Nautilus_View_stop_loading;
+ epv->selection_changed = impl_Nautilus_View_selection_changed;
+ epv->title_changed = impl_Nautilus_View_title_changed;
+ epv->history_changed = impl_Nautilus_View_history_changed;
}
static void
-nautilus_view_initialize (NautilusView *view)
+nautilus_view_init (NautilusView *view)
{
- CORBA_Environment ev;
-
view->details = g_new0 (NautilusViewDetails, 1);
view->details->incoming_queue = nautilus_idle_queue_new ();
view->details->outgoing_queue = nautilus_idle_queue_new ();
-
- CORBA_exception_init (&ev);
- bonobo_object_construct
- (BONOBO_OBJECT (view),
- impl_Nautilus_View__create (view, &ev));
- CORBA_exception_free (&ev);
}
NautilusView *
@@ -437,31 +380,10 @@ nautilus_view_construct (NautilusView *view,
(view, bonobo_control_new (widget));
}
-static void
-set_frame_callback (BonoboControl *control,
- gpointer callback_data)
-{
- nautilus_bonobo_object_force_destroy_when_owner_disappears
- (BONOBO_OBJECT (control),
- bonobo_control_get_control_frame (control));
-}
-
-static void
-widget_destroyed_callback (GtkWidget *widget,
- gpointer callback_data)
-{
- g_assert (NAUTILUS_IS_VIEW (callback_data));
-
- nautilus_bonobo_object_force_destroy_later
- (BONOBO_OBJECT (callback_data));
-}
-
NautilusView *
nautilus_view_construct_from_bonobo_control (NautilusView *view,
BonoboControl *control)
{
- GtkWidget *widget;
-
g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
g_return_val_if_fail (BONOBO_IS_CONTROL (control), NULL);
@@ -469,14 +391,6 @@ nautilus_view_construct_from_bonobo_control (NautilusView *view,
bonobo_object_add_interface (BONOBO_OBJECT (view), BONOBO_OBJECT (control));
nautilus_undo_set_up_bonobo_control (control);
- gtk_signal_connect (GTK_OBJECT (control), "set_frame",
- set_frame_callback, NULL);
-
- widget = bonobo_control_get_widget (control);
- gtk_signal_connect_while_alive (GTK_OBJECT (widget), "destroy",
- widget_destroyed_callback, view,
- GTK_OBJECT (view));
-
return view;
}
@@ -498,18 +412,21 @@ nautilus_view_destroy (GtkObject *object)
static Nautilus_ViewFrame
view_frame_call_begin (NautilusView *view, CORBA_Environment *ev)
{
+ Bonobo_ControlFrame control_frame;
Nautilus_ViewFrame view_frame;
g_return_val_if_fail (NAUTILUS_IS_VIEW (view), CORBA_OBJECT_NIL);
CORBA_exception_init (ev);
- view_frame = Bonobo_Unknown_queryInterface
- (bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
- "IDL:Nautilus/ViewFrame:1.0", ev);
+ control_frame = bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view), ev);
+ if (ev->_major != CORBA_NO_EXCEPTION) {
+ return CORBA_OBJECT_NIL;
+ }
+ view_frame = Bonobo_Unknown_queryInterface (control_frame, "IDL:Nautilus/ViewFrame:1.0", ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- view_frame = CORBA_OBJECT_NIL;
+ return CORBA_OBJECT_NIL;
}
return view_frame;
@@ -949,8 +866,8 @@ nautilus_view_set_up_ui (NautilusView *view,
ui_component = bonobo_control_get_ui_component (view->details->control);
/* Connect the UI component to the control frame's UI container. */
- ui_container = bonobo_control_get_remote_ui_container (view->details->control);
- bonobo_ui_component_set_container (ui_component, ui_container);
+ ui_container = bonobo_control_get_remote_ui_container (view->details->control, NULL);
+ bonobo_ui_component_set_container (ui_component, ui_container, NULL);
bonobo_object_release_unref (ui_container, NULL);
/* Set up the UI from an XML file. */
diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h
index 9ce471010..287e8a361 100644
--- a/libnautilus/nautilus-view.h
+++ b/libnautilus/nautilus-view.h
@@ -49,6 +49,7 @@ typedef struct {
typedef struct {
BonoboObjectClass parent_spot;
+ POA_Nautilus_View__epv epv;
void (* load_location) (NautilusView *view,
const char *location_uri);
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index b862c816b..a58c68124 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -42,9 +42,7 @@
#include <fcntl.h>
#include <gdk/gdkx.h>
#include <gtk/gtkcheckmenuitem.h>
-#include <libgnome/gnome-dentry.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-mime.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnautilus-private/nautilus-bonobo-extensions.h>
@@ -97,8 +95,8 @@ typedef struct {
char *mount_path;
} MountParameters;
-static void fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view);
-static void fm_desktop_icon_view_initialize_class (FMDesktopIconViewClass *klass);
+static void fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view);
+static void fm_desktop_icon_view_class_init (FMDesktopIconViewClass *klass);
static void fm_desktop_icon_view_trash_state_changed_callback (NautilusTrashMonitor *trash,
gboolean state,
gpointer callback_data);
@@ -271,7 +269,7 @@ fm_desktop_icon_view_destroy (GtkObject *object)
}
static void
-fm_desktop_icon_view_initialize_class (FMDesktopIconViewClass *klass)
+fm_desktop_icon_view_class_init (FMDesktopIconViewClass *klass)
{
GtkObjectClass *object_class;
FMDirectoryViewClass *fm_directory_view_class;
@@ -550,7 +548,7 @@ delayed_init (FMDesktopIconView *desktop_icon_view)
}
static void
-fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
+fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
{
GList *list;
NautilusIconContainer *icon_container;
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index e192a430e..3c8f56bcc 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -34,7 +34,7 @@
#include "fm-error-reporting.h"
#include "fm-properties-window.h"
#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-window.h>
#include <bonobo/bonobo-zoomable.h>
#include <eel/eel-background.h>
#include <eel/eel-glib-extensions.h>
@@ -256,8 +256,8 @@ typedef struct {
static void cancel_activate_callback (gpointer callback_data);
static gboolean display_selection_info_idle_callback (gpointer data);
static gboolean file_is_launchable (NautilusFile *file);
-static void fm_directory_view_initialize_class (FMDirectoryViewClass *klass);
-static void fm_directory_view_initialize (FMDirectoryView *view);
+static void fm_directory_view_class_init (FMDirectoryViewClass *klass);
+static void fm_directory_view_init (FMDirectoryView *view);
static void fm_directory_view_duplicate_selection (FMDirectoryView *view,
GList *files,
GArray *item_locations);
@@ -1155,7 +1155,7 @@ add_scripts_directory (FMDirectoryView *view,
}
static void
-fm_directory_view_initialize (FMDirectoryView *view)
+fm_directory_view_init (FMDirectoryView *view)
{
NautilusDirectory *scripts_directory;
@@ -1189,7 +1189,7 @@ fm_directory_view_initialize (FMDirectoryView *view)
bonobo_zoomable_set_parameters_full (view->details->zoomable,
0.0, .25, 4.0, TRUE, TRUE, FALSE,
fm_directory_view_preferred_zoom_levels, NULL,
- EEL_N_ELEMENTS (fm_directory_view_preferred_zoom_levels));
+ G_N_ELEMENTS (fm_directory_view_preferred_zoom_levels));
bonobo_object_add_interface (BONOBO_OBJECT (view->details->nautilus_view),
BONOBO_OBJECT (view->details->zoomable));
@@ -1831,7 +1831,7 @@ pre_copy_move (FMDirectoryView *directory_view)
eel_nullify_when_destroyed (&copy_move_done_data->directory_view);
/* We need to run after the default handler adds the folder we want to
- * operate on. The ADD_FILE signal is registered as GTK_RUN_LAST, so we
+ * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
* must use connect_after.
*/
gtk_signal_connect (GTK_OBJECT (directory_view),
@@ -1931,7 +1931,7 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data)
debuting_uri_data_free (debuting_uri_data);
} else {
/* We need to run after the default handler adds the folder we want to
- * operate on. The ADD_FILE signal is registered as GTK_RUN_LAST, so we
+ * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
* must use connect_after.
*/
gtk_signal_connect_full (GTK_OBJECT (directory_view),
@@ -3119,7 +3119,7 @@ new_folder_done (const char *new_folder_uri, gpointer data)
g_assert (FM_IS_DIRECTORY_VIEW (directory_view));
/* We need to run after the default handler adds the folder we want to
- * operate on. The ADD_FILE signal is registered as GTK_RUN_LAST, so we
+ * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
* must use connect_after.
*/
gtk_signal_connect_full (GTK_OBJECT (directory_view),
@@ -3333,7 +3333,7 @@ add_application_to_bonobo_menu (FMDirectoryView *directory_view,
static void
add_component_to_bonobo_menu (FMDirectoryView *directory_view,
- OAF_ServerInfo *content_view,
+ Bonobo_ServerInfo *content_view,
const char *uri,
int index)
{
@@ -5626,7 +5626,7 @@ real_sort_files (FMDirectoryView *view, GList **files)
}
static void
-fm_directory_view_initialize_class (FMDirectoryViewClass *klass)
+fm_directory_view_class_init (FMDirectoryViewClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -5650,68 +5650,77 @@ fm_directory_view_initialize_class (FMDirectoryViewClass *klass)
scrolled_window_class->scrollbar_spacing = 0;
signals[ADD_FILE] =
- gtk_signal_new ("add_file",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, add_file),
- gtk_marshal_NONE__OBJECT,
- GTK_TYPE_NONE, 1, NAUTILUS_TYPE_FILE);
+ g_signal_new ("add_file",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, add_file),
+ NULL, NULL,
+ gtk_marshal_NONE__OBJECT,
+ G_TYPE_NONE, 1, NAUTILUS_TYPE_FILE);
signals[BEGIN_FILE_CHANGES] =
- gtk_signal_new ("begin_file_changes",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, begin_file_changes),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("begin_file_changes",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, begin_file_changes),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[BEGIN_LOADING] =
- gtk_signal_new ("begin_loading",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, begin_loading),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("begin_loading",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, begin_loading),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[CLEAR] =
- gtk_signal_new ("clear",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, clear),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("clear",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, clear),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[END_FILE_CHANGES] =
- gtk_signal_new ("end_file_changes",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, end_file_changes),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("end_file_changes",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, end_file_changes),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[END_LOADING] =
- gtk_signal_new ("end_loading",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, end_loading),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("end_loading",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, end_loading),
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[FILE_CHANGED] =
- gtk_signal_new ("file_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, file_changed),
- gtk_marshal_NONE__OBJECT,
- GTK_TYPE_NONE, 1, NAUTILUS_TYPE_FILE);
+ g_signal_new ("file_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, file_changed),
+ NULL, NULL,
+ gtk_marshal_NONE__OBJECT,
+ G_TYPE_NONE, 1, NAUTILUS_TYPE_FILE);
signals[LOAD_ERROR] =
- gtk_signal_new ("load_error",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, load_error),
- gtk_marshal_NONE__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+ g_signal_new ("load_error",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, load_error),
+ NULL, NULL,
+ gtk_marshal_NONE__INT,
+ G_TYPE_NONE, 1, GTK_TYPE_INT);
signals[REMOVE_FILE] =
- gtk_signal_new ("remove_file",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (FMDirectoryViewClass, remove_file),
- gtk_marshal_NONE__OBJECT,
- GTK_TYPE_NONE, 1, NAUTILUS_TYPE_FILE);
+ g_signal_new ("remove_file",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (FMDirectoryViewClass, remove_file),
+ NULL, NULL,
+ gtk_marshal_NONE__OBJECT,
+ G_TYPE_NONE, 1, NAUTILUS_TYPE_FILE);
klass->accepts_dragged_files = real_accepts_dragged_files;
klass->file_limit_reached = real_file_limit_reached;
@@ -5744,8 +5753,6 @@ fm_directory_view_initialize_class (FMDirectoryViewClass *klass)
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, set_selection);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, zoom_to_level);
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE);
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index 264880429..523733d13 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -27,7 +27,6 @@
#include "fm-error-reporting.h"
#include <string.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-result.h>
#include <libnautilus-private/nautilus-file.h>
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 354f53c04..6a968e55e 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -47,7 +47,6 @@
#include <gtk/gtkwindow.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-config.h>
-#include <libgnome/gnome-mime.h>
#include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -120,8 +119,8 @@ typedef enum {
/* forward declarations */
static void create_icon_container (FMIconView *icon_view);
-static void fm_icon_view_initialize (FMIconView *icon_view);
-static void fm_icon_view_initialize_class (FMIconViewClass *klass);
+static void fm_icon_view_init (FMIconView *icon_view);
+static void fm_icon_view_class_init (FMIconViewClass *klass);
static void fm_icon_view_set_directory_sort_by (FMIconView *icon_view,
NautilusFile *file,
const char *sort_by);
@@ -867,7 +866,7 @@ get_sort_criterion_by_metadata_text (const char *metadata_text)
guint i;
/* Figure out what the new sort setting should be. */
- for (i = 0; i < EEL_N_ELEMENTS (sort_criteria); i++) {
+ for (i = 0; i < G_N_ELEMENTS (sort_criteria); i++) {
if (strcmp (sort_criteria[i].metadata_text, metadata_text) == 0) {
return &sort_criteria[i];
}
@@ -881,7 +880,7 @@ get_sort_criterion_by_id (const char *id)
guint i;
/* Figure out what the new sort setting should be. */
- for (i = 0; i < EEL_N_ELEMENTS (sort_criteria); i++) {
+ for (i = 0; i < G_N_ELEMENTS (sort_criteria); i++) {
if (strcmp (sort_criteria[i].id, id) == 0) {
return &sort_criteria[i];
}
@@ -895,7 +894,7 @@ get_sort_criterion_by_sort_type (NautilusFileSortType sort_type)
guint i;
/* Figure out what the new sort setting should be. */
- for (i = 0; i < EEL_N_ELEMENTS (sort_criteria); i++) {
+ for (i = 0; i < G_N_ELEMENTS (sort_criteria); i++) {
if (sort_type == sort_criteria[i].sort_type) {
return &sort_criteria[i];
}
@@ -2687,7 +2686,7 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur
}
static void
-fm_icon_view_initialize_class (FMIconViewClass *klass)
+fm_icon_view_class_init (FMIconViewClass *klass)
{
GtkObjectClass *object_class;
FMDirectoryViewClass *fm_directory_view_class;
@@ -2743,7 +2742,7 @@ fm_icon_view_initialize_class (FMIconViewClass *klass)
}
static void
-fm_icon_view_initialize (FMIconView *icon_view)
+fm_icon_view_init (FMIconView *icon_view)
{
NautilusIconContainer *icon_container;
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index b6fbeb745..36722fa72 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -121,9 +121,9 @@ static GtkWidget * fm_list_view_get_background_widget (FMDirecto
static void fm_list_view_clear (FMDirectoryView *view);
static GList * fm_list_view_get_selection (FMDirectoryView *view);
static NautilusZoomLevel fm_list_view_get_zoom_level (FMListView *list_view);
-static void fm_list_view_initialize (gpointer object,
+static void fm_list_view_init (gpointer object,
gpointer klass);
-static void fm_list_view_initialize_class (gpointer klass);
+static void fm_list_view_class_init (gpointer klass);
static void fm_list_view_destroy (GtkObject *object);
static void fm_list_view_end_file_changes (FMDirectoryView *view);
static void fm_list_view_reset_to_defaults (FMDirectoryView *view);
@@ -189,7 +189,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (FMListView,
/* GtkObject methods. */
static void
-fm_list_view_initialize_class (gpointer klass)
+fm_list_view_class_init (gpointer klass)
{
GtkObjectClass *object_class;
FMDirectoryViewClass *fm_directory_view_class;
@@ -244,7 +244,7 @@ fm_list_view_initialize_class (gpointer klass)
}
static void
-fm_list_view_initialize (gpointer object, gpointer klass)
+fm_list_view_init (gpointer object, gpointer klass)
{
FMListView *list_view;
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index d4e323014..93cf0c911 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -54,7 +54,6 @@
#include <gtk/gtksignal.h>
#include <gtk/gtktable.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-uidefs.h>
@@ -150,8 +149,8 @@ static GtkTargetEntry target_table[] = {
static void real_destroy (GtkObject *object);
static void real_finalize (GtkObject *object);
static void real_shutdown (GtkObject *object);
-static void fm_properties_window_initialize_class (FMPropertiesWindowClass *class);
-static void fm_properties_window_initialize (FMPropertiesWindow *window);
+static void fm_properties_window_class_init (FMPropertiesWindowClass *class);
+static void fm_properties_window_init (FMPropertiesWindow *window);
static void create_properties_window_callback (NautilusFile *file,
gpointer data);
static void cancel_group_change_callback (gpointer callback_data);
@@ -172,7 +171,7 @@ static void remove_pending_file (StartupData *data
EEL_DEFINE_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
static void
-fm_properties_window_initialize_class (FMPropertiesWindowClass *class)
+fm_properties_window_class_init (FMPropertiesWindowClass *class)
{
GtkObjectClass *object_class;
@@ -184,7 +183,7 @@ fm_properties_window_initialize_class (FMPropertiesWindowClass *class)
}
static void
-fm_properties_window_initialize (FMPropertiesWindow *window)
+fm_properties_window_init (FMPropertiesWindow *window)
{
window->details = g_new0 (FMPropertiesWindowDetails, 1);
@@ -287,7 +286,7 @@ uri_is_local_image (const char *uri)
return FALSE;
}
- pixbuf = gdk_pixbuf_new_from_file (image_path);
+ pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
if (pixbuf == NULL) {
@@ -358,7 +357,7 @@ create_image_widget_for_file (NautilusFile *file)
/* prepare the image to receive dropped objects to assign custom images */
gtk_drag_dest_set (GTK_WIDGET (image),
GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
- target_table, EEL_N_ELEMENTS (target_table),
+ target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
gtk_signal_connect( GTK_OBJECT (image), "drag_data_received",
diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c
index 920a19e27..5448cb0c7 100644
--- a/src/file-manager/fm-search-list-view.c
+++ b/src/file-manager/fm-search-list-view.c
@@ -70,9 +70,9 @@ struct FMSearchListViewDetails {
BonoboUIComponent *ui;
};
-static void fm_search_list_view_initialize (gpointer object,
+static void fm_search_list_view_init (gpointer object,
gpointer klass);
-static void fm_search_list_view_initialize_class (gpointer klass);
+static void fm_search_list_view_class_init (gpointer klass);
static void real_destroy (GtkObject *object);
static void real_add_file (FMDirectoryView *view,
NautilusFile *file);
@@ -333,7 +333,7 @@ display_system_services_are_disabled_dialog (gboolean unindexed_search_is_availa
#endif
static void
-fm_search_list_view_initialize_class (gpointer klass)
+fm_search_list_view_class_init (gpointer klass)
{
GtkObjectClass *object_class;
FMDirectoryViewClass *fm_directory_view_class;
@@ -369,7 +369,7 @@ fm_search_list_view_initialize_class (gpointer klass)
}
static void
-fm_search_list_view_initialize (gpointer object,
+fm_search_list_view_init (gpointer object,
gpointer klass)
{
FMSearchListView *search_view;
diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c
index 8c625acf0..15acde983 100644
--- a/src/file-manager/nautilus-indexing-info.c
+++ b/src/file-manager/nautilus-indexing-info.c
@@ -30,7 +30,6 @@
#include <gtk/gtkmain.h>
#include <gtk/gtkprogressbar.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <eel/eel-gdk-extensions.h>
diff --git a/src/nautilus-about.c b/src/nautilus-about.c
index 49ef3fc55..3a037aeb9 100644
--- a/src/nautilus-about.c
+++ b/src/nautilus-about.c
@@ -28,7 +28,6 @@
#include <config.h>
#include "nautilus-about.h"
-#include <libgnome/gnome-defs.h>
#include <math.h>
#include <gnome.h>
@@ -62,8 +61,8 @@ struct NautilusAboutDetails {
static gboolean nautilus_about_close (NautilusAbout *about,
gpointer *unused);
-static void nautilus_about_initialize_class (NautilusAboutClass *klass);
-static void nautilus_about_initialize (NautilusAbout *about);
+static void nautilus_about_class_init (NautilusAboutClass *klass);
+static void nautilus_about_init (NautilusAbout *about);
static void nautilus_about_destroy (GtkObject *object);
static void nautilus_about_repaint (GtkWidget *drawing_area,
GdkEventExpose *event,
@@ -92,7 +91,7 @@ static int update_authors_if_necessary (gpointer callback_d
EEL_DEFINE_CLASS_BOILERPLATE (NautilusAbout, nautilus_about, GNOME_TYPE_DIALOG)
static void
-nautilus_about_initialize_class (NautilusAboutClass *about_class)
+nautilus_about_class_init (NautilusAboutClass *about_class)
{
GtkObjectClass *object_class = GTK_OBJECT_CLASS (about_class);
@@ -125,7 +124,7 @@ nautilus_about_destroy (GtkObject *object)
/* initialize the about */
static void
-nautilus_about_initialize (NautilusAbout *about)
+nautilus_about_init (NautilusAbout *about)
{
char *background_path;
GtkWidget *frame;
@@ -134,7 +133,7 @@ nautilus_about_initialize (NautilusAbout *about)
about->details = g_new0 (NautilusAboutDetails, 1);
background_path = nautilus_theme_get_image_path ("about_background.png");
- about->details->background_pixbuf = gdk_pixbuf_new_from_file (background_path);
+ about->details->background_pixbuf = gdk_pixbuf_new_from_file (background_path, NULL);
g_free (background_path);
/* set the window title and standard close key accelerator */
diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c
index 5e397e3b5..87253017d 100644
--- a/src/nautilus-applicable-views.c
+++ b/src/nautilus-applicable-views.c
@@ -96,7 +96,7 @@ got_file_info_callback (NautilusFile *file,
GnomeVFSResult vfs_result_code;
NautilusDetermineViewResult result_code;
NautilusViewIdentifier *default_id;
- OAF_ServerInfo *default_component;
+ Bonobo_ServerInfo *default_component;
handle = (NautilusDetermineViewHandle *) callback_data;
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index eb04486e4..1822e3bff 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -48,11 +48,10 @@
#include <gtk/gtksignal.h>
#include <libgnome/gnome-config.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-metadata.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-client.h>
#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -64,7 +63,7 @@
#include <libnautilus-private/nautilus-undo-manager.h>
#include <libnautilus-private/nautilus-volume-monitor.h>
#include <libnautilus-private/nautilus-authn-manager.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
/* Needed for the is_kdesktop_present check */
#include <gdk/gdkx.h>
@@ -87,8 +86,8 @@ static CORBA_Object create_object (PortableServer_Serva
const CORBA_char *iid,
const GNOME_stringlist *params,
CORBA_Environment *ev);
-static void nautilus_application_initialize (NautilusApplication *application);
-static void nautilus_application_initialize_class (NautilusApplicationClass *klass);
+static void nautilus_application_init (NautilusApplication *application);
+static void nautilus_application_class_init (NautilusApplicationClass *klass);
static void nautilus_application_destroy (GtkObject *object);
static gboolean confirm_ok_to_run_as_root (void);
static gboolean need_to_show_first_time_druid (void);
@@ -184,13 +183,13 @@ nautilus_application_get_window_list (void)
}
static void
-nautilus_application_initialize_class (NautilusApplicationClass *klass)
+nautilus_application_class_init (NautilusApplicationClass *klass)
{
GTK_OBJECT_CLASS (klass)->destroy = nautilus_application_destroy;
}
static void
-nautilus_application_initialize (NautilusApplication *application)
+nautilus_application_init (NautilusApplication *application)
{
CORBA_Environment ev;
CORBA_Object corba_object;
@@ -447,10 +446,10 @@ static void
finish_startup (NautilusApplication *application)
{
/* initialize the sound machinery */
- nautilus_sound_initialize ();
+ nautilus_sound_init ();
/* initialize URI authentication manager */
- nautilus_authentication_manager_initialize ();
+ nautilus_authentication_manager_init ();
/* Make the desktop work with gmc and old Nautilus. */
migrate_gmc_trash ();
@@ -507,7 +506,7 @@ nautilus_application_startup (NautilusApplication *application,
/* Start up the factory. */
while (TRUE) {
/* Try to register the file manager view factory with OAF. */
- result = oaf_active_server_register
+ result = bonobo_activation_active_server_register
(FACTORY_IID,
bonobo_object_corba_objref (BONOBO_OBJECT (application)));
switch (result) {
@@ -556,7 +555,7 @@ nautilus_application_startup (NautilusApplication *application,
break;
default:
/* This should never happen. */
- g_warning ("bad error code from oaf_active_server_register");
+ g_warning ("bad error code from bonobo_activation_active_server_register");
case OAF_REG_ERROR:
/* Some misc. error (can never happen with current
* version of OAF). Show dialog and terminate the
@@ -575,7 +574,7 @@ nautilus_application_startup (NautilusApplication *application,
/* Get the shell object. */
if (message == NULL) {
- shell = oaf_activate_from_id (SHELL_IID, 0, NULL, NULL);
+ shell = bonobo_activation_activate_from_id (SHELL_IID, 0, NULL, NULL);
if (!CORBA_Object_is_nil (shell, &ev)) {
break;
}
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 25ca22b65..41f4fdc28 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -67,7 +67,7 @@ static void stop_monitoring_bookmark (NautilusBookmarkList *b
/* Initialization. */
static void
-nautilus_bookmark_list_initialize_class (NautilusBookmarkListClass *class)
+nautilus_bookmark_list_class_init (NautilusBookmarkListClass *class)
{
GtkObjectClass *object_class;
@@ -76,13 +76,14 @@ nautilus_bookmark_list_initialize_class (NautilusBookmarkListClass *class)
object_class->destroy = destroy;
signals[CONTENTS_CHANGED] =
- gtk_signal_new ("contents_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusBookmarkListClass,
+ g_signal_new ("contents_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusBookmarkListClass,
contents_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class,
signals,
@@ -90,7 +91,7 @@ nautilus_bookmark_list_initialize_class (NautilusBookmarkListClass *class)
}
static void
-nautilus_bookmark_list_initialize (NautilusBookmarkList *bookmarks)
+nautilus_bookmark_list_init (NautilusBookmarkList *bookmarks)
{
nautilus_bookmark_list_load_file (bookmarks);
}
diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c
index 7b672718b..ab03f96db 100644
--- a/src/nautilus-complex-search-bar.c
+++ b/src/nautilus-complex-search-bar.c
@@ -67,8 +67,8 @@ static void real_activate (NautilusNavigationBar *bar);
static char *nautilus_complex_search_bar_get_location (NautilusNavigationBar *bar);
static void nautilus_complex_search_bar_set_location (NautilusNavigationBar *bar,
const char *location);
-static void nautilus_complex_search_bar_initialize_class (NautilusComplexSearchBarClass *class);
-static void nautilus_complex_search_bar_initialize (NautilusComplexSearchBar *bar);
+static void nautilus_complex_search_bar_class_init (NautilusComplexSearchBarClass *class);
+static void nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar);
static void nautilus_complex_search_bar_destroy (GtkObject *object);
static void attach_criterion_to_search_bar (NautilusComplexSearchBar *bar,
NautilusSearchBarCriterion *criterion,
@@ -169,7 +169,7 @@ queue_search_bar_resize_callback (GtkObject *search_bar,
}
static void
-nautilus_complex_search_bar_initialize_class (NautilusComplexSearchBarClass *klass)
+nautilus_complex_search_bar_class_init (NautilusComplexSearchBarClass *klass)
{
GtkObjectClass *object_class;
NautilusNavigationBarClass *navigation_bar_class;
@@ -185,7 +185,7 @@ nautilus_complex_search_bar_initialize_class (NautilusComplexSearchBarClass *kla
}
static void
-nautilus_complex_search_bar_initialize (NautilusComplexSearchBar *bar)
+nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar)
{
NautilusSearchBarCriterion *file_name_criterion;
GtkWidget *hbox;
@@ -455,7 +455,7 @@ load_find_them_pixmap_widget (void)
GdkBitmap *mask;
GtkWidget *widget;
- pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png");
+ pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png", NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
gdk_pixbuf_unref (pixbuf);
diff --git a/src/nautilus-component-adapter-factory.c b/src/nautilus-component-adapter-factory.c
index 7eda045ed..e89342ceb 100644
--- a/src/nautilus-component-adapter-factory.c
+++ b/src/nautilus-component-adapter-factory.c
@@ -41,8 +41,8 @@ struct NautilusComponentAdapterFactoryDetails {
static NautilusComponentAdapterFactory *global_component_adapter_factory = NULL;
-static void nautilus_component_adapter_factory_initialize_class (NautilusComponentAdapterFactoryClass *klass);
-static void nautilus_component_adapter_factory_initialize (NautilusComponentAdapterFactory *factory);
+static void nautilus_component_adapter_factory_class_init (NautilusComponentAdapterFactoryClass *klass);
+static void nautilus_component_adapter_factory_init (NautilusComponentAdapterFactory *factory);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusComponentAdapterFactory,
nautilus_component_adapter_factory,
@@ -113,7 +113,7 @@ get_corba_factory (NautilusComponentAdapterFactory *factory)
}
static void
-nautilus_component_adapter_factory_initialize (NautilusComponentAdapterFactory *factory)
+nautilus_component_adapter_factory_init (NautilusComponentAdapterFactory *factory)
{
factory->details = g_new0 (NautilusComponentAdapterFactoryDetails, 1);
}
@@ -132,7 +132,7 @@ nautilus_component_adapter_factory_destroy (GtkObject *object)
}
static void
-nautilus_component_adapter_factory_initialize_class (NautilusComponentAdapterFactoryClass *klass)
+nautilus_component_adapter_factory_class_init (NautilusComponentAdapterFactoryClass *klass)
{
GtkObjectClass *object_class;
diff --git a/src/nautilus-component-adapter-factory.h b/src/nautilus-component-adapter-factory.h
index e169c50e5..ecf137ef9 100644
--- a/src/nautilus-component-adapter-factory.h
+++ b/src/nautilus-component-adapter-factory.h
@@ -30,7 +30,6 @@
#define NAUTILUS_COMPONENT_ADAPTER_FACTORY_H
#include <gtk/gtkobject.h>
-#include <bonobo/bonobo-object-client.h>
#include <libnautilus/nautilus-view-component.h>
typedef struct NautilusComponentAdapterFactory NautilusComponentAdapterFactory;
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 85b9d7acd..1b1e783d4 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -45,8 +45,8 @@ struct NautilusDesktopWindowDetails {
GList *unref_list;
};
-static void nautilus_desktop_window_initialize_class (NautilusDesktopWindowClass *klass);
-static void nautilus_desktop_window_initialize (NautilusDesktopWindow *window);
+static void nautilus_desktop_window_class_init (NautilusDesktopWindowClass *klass);
+static void nautilus_desktop_window_init (NautilusDesktopWindow *window);
static void destroy (GtkObject *object);
static void realize (GtkWidget *widget);
static void map (GtkWidget *widget);
@@ -58,7 +58,7 @@ static void set_wmspec_desktop_hint (GdkWindow *window);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusDesktopWindow, nautilus_desktop_window, NAUTILUS_TYPE_WINDOW)
static void
-nautilus_desktop_window_initialize_class (NautilusDesktopWindowClass *klass)
+nautilus_desktop_window_class_init (NautilusDesktopWindowClass *klass)
{
GTK_OBJECT_CLASS (klass)->destroy = destroy;
GTK_WIDGET_CLASS (klass)->realize = realize;
@@ -68,7 +68,7 @@ nautilus_desktop_window_initialize_class (NautilusDesktopWindowClass *klass)
}
static void
-nautilus_desktop_window_initialize (NautilusDesktopWindow *window)
+nautilus_desktop_window_init (NautilusDesktopWindow *window)
{
window->details = g_new0 (NautilusDesktopWindowDetails, 1);
@@ -151,7 +151,7 @@ nautilus_desktop_window_new (NautilusApplication *application)
gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (nautilus_desktop_window_delete_event), NULL);
/* Point window at the desktop folder.
- * Note that nautilus_desktop_window_initialize is too early to do this.
+ * Note that nautilus_desktop_window_init is too early to do this.
*/
nautilus_desktop_window_update_directory (window);
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index cf12d9bd2..f16bf5230 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -365,7 +365,7 @@ create_named_pixbuf (const char *name)
return NULL;
}
- pixbuf = gdk_pixbuf_new_from_file (path);
+ pixbuf = gdk_pixbuf_new_from_file (path, NULL);
g_free (path);
return pixbuf;
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 54fd49b44..1ba30d262 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -94,8 +94,8 @@ struct NautilusSidebarDetails {
/* button assignments */
#define CONTEXTUAL_MENU_BUTTON 3
-static void nautilus_sidebar_initialize_class (GtkObjectClass *object_klass);
-static void nautilus_sidebar_initialize (GtkObject *object);
+static void nautilus_sidebar_class_init (GtkObjectClass *object_klass);
+static void nautilus_sidebar_init (GtkObject *object);
static void nautilus_sidebar_deactivate_panel (NautilusSidebar *sidebar);
static gboolean nautilus_sidebar_press_event (GtkWidget *widget,
GdkEventButton *event);
@@ -173,7 +173,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_
/* initializing the class object by installing the operations we override */
static void
-nautilus_sidebar_initialize_class (GtkObjectClass *object_klass)
+nautilus_sidebar_class_init (GtkObjectClass *object_klass)
{
GtkWidgetClass *widget_class;
@@ -193,16 +193,15 @@ nautilus_sidebar_initialize_class (GtkObjectClass *object_klass)
widget_class->realize = nautilus_sidebar_realize;
/* add the "location changed" signal */
- signals[LOCATION_CHANGED] = gtk_signal_new
+ signals[LOCATION_CHANGED] = g_signal_new
("location_changed",
- GTK_RUN_LAST,
- object_klass->type,
- GTK_SIGNAL_OFFSET (NautilusSidebarClass,
+ G_TYPE_FROM_CLASS (object_klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusSidebarClass,
location_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-
- gtk_object_class_add_signals (object_klass, signals, LAST_SIGNAL);
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
&confirm_trash_auto_value);
@@ -228,7 +227,7 @@ make_button_box (NautilusSidebar *sidebar)
/* initialize the instance's fields, create the necessary subviews, etc. */
static void
-nautilus_sidebar_initialize (GtkObject *object)
+nautilus_sidebar_init (GtkObject *object)
{
NautilusSidebar *sidebar;
GtkWidget* widget;
@@ -295,7 +294,7 @@ nautilus_sidebar_initialize (GtkObject *object)
/* prepare ourselves to receive dropped objects */
gtk_drag_dest_set (GTK_WIDGET (sidebar),
GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
- target_table, EEL_N_ELEMENTS (target_table),
+ target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
}
@@ -676,7 +675,7 @@ uri_is_local_image (const char *uri)
return FALSE;
}
- pixbuf = gdk_pixbuf_new_from_file (image_path);
+ pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
if (pixbuf == NULL) {
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index d009b4fd4..71388783f 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -44,10 +44,8 @@
#include <gtk/gtkdnd.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-mime.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnautilus-private/nautilus-entry.h>
@@ -99,8 +97,8 @@ static GtkTargetEntry drop_types [] = {
static char *nautilus_location_bar_get_location (NautilusNavigationBar *navigation_bar);
static void nautilus_location_bar_set_location (NautilusNavigationBar *navigation_bar,
const char *location);
-static void nautilus_location_bar_initialize_class (NautilusLocationBarClass *class);
-static void nautilus_location_bar_initialize (NautilusLocationBar *bar);
+static void nautilus_location_bar_class_init (NautilusLocationBarClass *class);
+static void nautilus_location_bar_init (NautilusLocationBar *bar);
static void nautilus_location_bar_update_label (NautilusLocationBar *bar);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusLocationBar,
@@ -599,7 +597,7 @@ destroy (GtkObject *object)
}
static void
-nautilus_location_bar_initialize_class (NautilusLocationBarClass *class)
+nautilus_location_bar_class_init (NautilusLocationBarClass *class)
{
GtkObjectClass *object_class;
NautilusNavigationBarClass *navigation_bar_class;
@@ -615,7 +613,7 @@ nautilus_location_bar_initialize_class (NautilusLocationBarClass *class)
}
static void
-nautilus_location_bar_initialize (NautilusLocationBar *bar)
+nautilus_location_bar_init (NautilusLocationBar *bar)
{
GtkWidget *label;
GtkWidget *entry;
@@ -662,7 +660,7 @@ nautilus_location_bar_initialize (NautilusLocationBar *bar)
/* Drag source */
gtk_drag_source_set (GTK_WIDGET (event_box),
GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
- drag_types, EEL_N_ELEMENTS (drag_types),
+ drag_types, G_N_ELEMENTS (drag_types),
GDK_ACTION_LINK);
gtk_signal_connect (GTK_OBJECT (event_box), "drag_data_get",
GTK_SIGNAL_FUNC (drag_data_get_callback),
@@ -671,7 +669,7 @@ nautilus_location_bar_initialize (NautilusLocationBar *bar)
/* Drag dest. */
gtk_drag_dest_set (GTK_WIDGET (bar),
GTK_DEST_DEFAULT_ALL,
- drop_types, EEL_N_ELEMENTS (drop_types),
+ drop_types, G_N_ELEMENTS (drop_types),
GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
gtk_signal_connect (GTK_OBJECT (bar), "drag_data_received",
GTK_SIGNAL_FUNC (drag_data_received_callback),
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a44db2873..32fe587f1 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -44,13 +44,12 @@
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-metadata.h>
-#include <libgnomeui/gnome-init.h>
+#include <libgnome/gnome-init.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libnautilus-private/nautilus-directory-metafile.h>
#include <libnautilus-private/nautilus-global-preferences.h>
#include <libnautilus-private/nautilus-lib-self-check-functions.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
#include <popt.h>
#include <stdlib.h>
#include <X11/Xlib.h>
@@ -199,13 +198,13 @@ main (int argc, char *argv[])
perform_self_check = FALSE;
restart_shell = FALSE;
- gnomelib_register_popt_table (oaf_popt_options,
- oaf_get_popt_table_name ());
+ gnomelib_register_popt_table (bonobo_activation_popt_options,
+ bonobo_activation_get_popt_table_name ());
gnome_init_with_popt_table ("nautilus", VERSION,
argc, argv, options, 0,
&popt_context);
eel_setenv ("DISPLAY", DisplayString (GDK_DISPLAY ()), TRUE);
- orb = oaf_init (argc, argv);
+ orb = bonobo_activation_init (argc, argv);
gdk_rgb_init ();
/* Workaround for gnome-libs bug.
@@ -243,7 +242,7 @@ main (int argc, char *argv[])
g_thread_init (NULL);
if (g_getenv ("NAUTILUS_ENABLE_TEST_COMPONENTS") != NULL) {
- oaf_set_test_components_enabled (TRUE);
+ bonobo_activation_set_test_components_enabled (TRUE);
}
gnome_vfs_init ();
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
@@ -253,7 +252,7 @@ main (int argc, char *argv[])
* defaults are available before any preference peeking
* happens.
*/
- nautilus_global_preferences_initialize ();
+ nautilus_global_preferences_init ();
if (no_desktop) {
eel_preferences_set_is_invisible
(NAUTILUS_PREFERENCES_SHOW_DESKTOP, TRUE);
diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c
index 7932338a1..862d1e78e 100644
--- a/src/nautilus-navigation-bar.c
+++ b/src/nautilus-navigation-bar.c
@@ -40,8 +40,8 @@ enum {
};
static guint signals[LAST_SIGNAL];
-static void nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *class);
-static void nautilus_navigation_bar_initialize (NautilusNavigationBar *bar);
+static void nautilus_navigation_bar_class_init (NautilusNavigationBarClass *class);
+static void nautilus_navigation_bar_init (NautilusNavigationBar *bar);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, EEL_TYPE_GENEROUS_BIN)
@@ -49,31 +49,31 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
static void
-nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *klass)
+nautilus_navigation_bar_class_init (NautilusNavigationBarClass *klass)
{
GtkObjectClass *object_class;
object_class = GTK_OBJECT_CLASS (klass);
- signals[ACTIVATE] = gtk_signal_new
+ signals[ACTIVATE] = g_signal_new
("activate",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusNavigationBarClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusNavigationBarClass,
activate),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
- signals[LOCATION_CHANGED] = gtk_signal_new
+ signals[LOCATION_CHANGED] = g_signal_new
("location_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusNavigationBarClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusNavigationBarClass,
location_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
klass->activate = NULL;
@@ -82,7 +82,7 @@ nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *klass)
}
static void
-nautilus_navigation_bar_initialize (NautilusNavigationBar *bar)
+nautilus_navigation_bar_init (NautilusNavigationBar *bar)
{
}
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 05147dc5d..0990c89c9 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -116,8 +116,8 @@ static GList *history_list = NULL;
static GdkPixmap *mini_icon_pixmap;
static GdkBitmap *mini_icon_mask;
-static void nautilus_window_initialize_class (NautilusWindowClass *klass);
-static void nautilus_window_initialize (NautilusWindow *window);
+static void nautilus_window_class_init (NautilusWindowClass *klass);
+static void nautilus_window_init (NautilusWindow *window);
static void nautilus_window_destroy (GtkObject *object);
static void nautilus_window_set_arg (GtkObject *object,
GtkArg *arg,
@@ -149,7 +149,7 @@ unref_mini_icon (void)
}
static void
-nautilus_window_initialize_class (NautilusWindowClass *klass)
+nautilus_window_class_init (NautilusWindowClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -183,7 +183,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
if (filename != NULL) {
- pixbuf = gdk_pixbuf_new_from_file (filename);
+ pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
@@ -213,7 +213,7 @@ add_sidebar_panel_callback (const char *name,
}
static void
-nautilus_window_initialize (NautilusWindow *window)
+nautilus_window_init (NautilusWindow *window)
{
window->details = g_new0 (NautilusWindowDetails, 1);
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index 0e764d3e3..fd49f4b7f 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -29,7 +29,7 @@
#ifndef NAUTILUS_WINDOW_H
#define NAUTILUS_WINDOW_H
-#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-window.h>
#include <eel/eel-glib-extensions.h>
#include <libnautilus-private/nautilus-bookmark.h>
#include <libnautilus-private/nautilus-view-identifier.h>
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 05147dc5d..0990c89c9 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -116,8 +116,8 @@ static GList *history_list = NULL;
static GdkPixmap *mini_icon_pixmap;
static GdkBitmap *mini_icon_mask;
-static void nautilus_window_initialize_class (NautilusWindowClass *klass);
-static void nautilus_window_initialize (NautilusWindow *window);
+static void nautilus_window_class_init (NautilusWindowClass *klass);
+static void nautilus_window_init (NautilusWindow *window);
static void nautilus_window_destroy (GtkObject *object);
static void nautilus_window_set_arg (GtkObject *object,
GtkArg *arg,
@@ -149,7 +149,7 @@ unref_mini_icon (void)
}
static void
-nautilus_window_initialize_class (NautilusWindowClass *klass)
+nautilus_window_class_init (NautilusWindowClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -183,7 +183,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
if (filename != NULL) {
- pixbuf = gdk_pixbuf_new_from_file (filename);
+ pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
@@ -213,7 +213,7 @@ add_sidebar_panel_callback (const char *name,
}
static void
-nautilus_window_initialize (NautilusWindow *window)
+nautilus_window_init (NautilusWindow *window)
{
window->details = g_new0 (NautilusWindowDetails, 1);
diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h
index 0e764d3e3..fd49f4b7f 100644
--- a/src/nautilus-object-window.h
+++ b/src/nautilus-object-window.h
@@ -29,7 +29,7 @@
#ifndef NAUTILUS_WINDOW_H
#define NAUTILUS_WINDOW_H
-#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-window.h>
#include <eel/eel-glib-extensions.h>
#include <libnautilus-private/nautilus-bookmark.h>
#include <libnautilus-private/nautilus-view-identifier.h>
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index 4d9572353..24dea9285 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -584,7 +584,7 @@ preferences_dialog_destroy (void)
static GtkWidget *
global_preferences_get_dialog (void)
{
- nautilus_global_preferences_initialize ();
+ nautilus_global_preferences_init ();
if (preferences_dialog == NULL) {
preferences_dialog = preferences_dialog_create ();
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 13d2267ac..7b2a4363f 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -65,12 +65,11 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkviewport.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-color-picker.h>
#include <libgnomeui/gnome-icon-entry.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnautilus-private/nautilus-customization-data.h>
@@ -143,8 +142,8 @@ struct NautilusPropertyBrowserDetails {
gboolean toggle_button_flag;
};
-static void nautilus_property_browser_initialize_class (GtkObjectClass *object_klass);
-static void nautilus_property_browser_initialize (GtkObject *object);
+static void nautilus_property_browser_class_init (GtkObjectClass *object_klass);
+static void nautilus_property_browser_init (GtkObject *object);
static void nautilus_property_browser_destroy (GtkObject *object);
static void nautilus_property_browser_preferences_changed (NautilusPropertyBrowser *property_browser);
static void nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_browser);
@@ -221,7 +220,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusPropertyBrowser,
/* initializing the class object by installing the operations we override */
static void
-nautilus_property_browser_initialize_class (GtkObjectClass *object_klass)
+nautilus_property_browser_class_init (GtkObjectClass *object_klass)
{
NautilusPropertyBrowserClass *klass;
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (object_klass);
@@ -236,7 +235,7 @@ nautilus_property_browser_initialize_class (GtkObjectClass *object_klass)
/* initialize the instance's fields, create the necessary subviews, etc. */
static void
-nautilus_property_browser_initialize (GtkObject *object)
+nautilus_property_browser_init (GtkObject *object)
{
NautilusPropertyBrowser *property_browser;
GtkWidget* widget, *temp_box, *temp_hbox, *temp_frame;
@@ -254,7 +253,7 @@ nautilus_property_browser_initialize (GtkObject *object)
/* load the chit frame */
temp_str = nautilus_pixmap_file ("chit_frame.png");
- property_browser->details->property_chit = gdk_pixbuf_new_from_file (temp_str);
+ property_browser->details->property_chit = gdk_pixbuf_new_from_file (temp_str, NULL);
g_free (temp_str);
/* set the initial size of the property browser */
@@ -663,7 +662,7 @@ make_drag_image (NautilusPropertyBrowser *property_browser, const char* file_nam
g_free (user_directory);
}
- orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name);
+ orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name, NULL);
is_reset = eel_strcmp (file_name, RESET_IMAGE_NAME) == 0;
@@ -1479,7 +1478,7 @@ element_clicked_callback (GtkWidget *image_table,
drag_types[0].target = "x-special/gnome-reset-background";
}
- target_list = gtk_target_list_new (drag_types, EEL_N_ELEMENTS (drag_types));
+ target_list = gtk_target_list_new (drag_types, G_N_ELEMENTS (drag_types));
nautilus_property_browser_set_dragged_file(property_browser, element_name);
context = gtk_drag_begin (GTK_WIDGET (property_browser),
@@ -1718,7 +1717,7 @@ add_reset_property (NautilusPropertyBrowser *property_browser)
GdkPixbuf *reset_pixbuf, *reset_chit;
reset_image_file_name = g_strdup_printf ("%s/%s/%s", NAUTILUS_DATADIR, "patterns", RESET_IMAGE_NAME);
- reset_pixbuf = gdk_pixbuf_new_from_file (reset_image_file_name);
+ reset_pixbuf = gdk_pixbuf_new_from_file (reset_image_file_name, NULL);
reset_chit = nautilus_customization_make_pattern_chit (reset_pixbuf, property_browser->details->property_chit, FALSE, TRUE);
g_free (reset_image_file_name);
diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c
index 33f4b4a70..d85ec1ecb 100644
--- a/src/nautilus-search-bar-criterion.c
+++ b/src/nautilus-search-bar-criterion.c
@@ -40,7 +40,6 @@
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dateedit.h>
#include <libgnomeui/gnome-uidefs.h>
@@ -174,8 +173,8 @@ static NautilusSearchBarCriterion * nautilus_search_bar_criterion_new_from_value
NautilusSearchBarCriterionType get_next_default_search_criterion_type (NautilusSearchBarCriterionType type) ;
-static void nautilus_search_bar_criterion_initialize_class (NautilusSearchBarCriterionClass *klass);
-static void nautilus_search_bar_criterion_initialize (NautilusSearchBarCriterion *criterion);
+static void nautilus_search_bar_criterion_class_init (NautilusSearchBarCriterionClass *klass);
+static void nautilus_search_bar_criterion_init (NautilusSearchBarCriterion *criterion);
static gboolean modified_relation_should_show_value (int relation_index);
static void hide_date_widget (GtkObject *object,
gpointer data);
@@ -210,22 +209,21 @@ static void nautilus_search_bar_criterion_destroy
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSearchBarCriterion, nautilus_search_bar_criterion, GTK_TYPE_EVENT_BOX)
static void
-nautilus_search_bar_criterion_initialize_class (NautilusSearchBarCriterionClass *klass)
+nautilus_search_bar_criterion_class_init (NautilusSearchBarCriterionClass *klass)
{
GtkObjectClass *object_class;
object_class = GTK_OBJECT_CLASS (klass);
object_class->destroy = nautilus_search_bar_criterion_destroy;
- signals[CRITERION_TYPE_CHANGED] = gtk_signal_new
+ signals[CRITERION_TYPE_CHANGED] = g_signal_new
("criterion_type_changed",
- GTK_RUN_LAST,
- object_class->type,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
0,
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ G_TYPE_NONE, 0);
}
@@ -257,7 +255,7 @@ nautilus_search_bar_criterion_new (void)
static void
-nautilus_search_bar_criterion_initialize (NautilusSearchBarCriterion *criterion)
+nautilus_search_bar_criterion_init (NautilusSearchBarCriterion *criterion)
{
criterion->details = g_new0 (NautilusSearchBarCriterionDetails, 1);
}
diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
index 1e5653bcb..b4abb07c0 100644
--- a/src/nautilus-search-bar.c
+++ b/src/nautilus-search-bar.c
@@ -36,17 +36,17 @@
* Perhaps we can remove it.
*/
-static void nautilus_search_bar_initialize_class (NautilusSearchBarClass *class);
-static void nautilus_search_bar_initialize (NautilusSearchBar *bar);
+static void nautilus_search_bar_class_init (NautilusSearchBarClass *class);
+static void nautilus_search_bar_init (NautilusSearchBar *bar);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSearchBar, nautilus_search_bar, NAUTILUS_TYPE_NAVIGATION_BAR)
static void
-nautilus_search_bar_initialize_class (NautilusSearchBarClass *klass)
+nautilus_search_bar_class_init (NautilusSearchBarClass *klass)
{
}
static void
-nautilus_search_bar_initialize (NautilusSearchBar *bar)
+nautilus_search_bar_init (NautilusSearchBar *bar)
{
}
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index 6bc1cffc5..6415bd4f8 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -43,7 +43,7 @@
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-global-preferences.h>
@@ -65,8 +65,8 @@ struct NautilusShellDetails {
NautilusApplication *application;
};
-static void nautilus_shell_initialize (NautilusShell *shell);
-static void nautilus_shell_initialize_class (NautilusShellClass *klass);
+static void nautilus_shell_init (NautilusShell *shell);
+static void nautilus_shell_class_init (NautilusShellClass *klass);
static void destroy (GtkObject *shell);
static void corba_open_windows (PortableServer_Servant servant,
const Nautilus_URIList *list,
@@ -90,7 +90,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusShell,
BONOBO_OBJECT_TYPE)
static void
-nautilus_shell_initialize_class (NautilusShellClass *klass)
+nautilus_shell_class_init (NautilusShellClass *klass)
{
GTK_OBJECT_CLASS (klass)->destroy = destroy;
}
@@ -140,7 +140,7 @@ nautilus_shell_create_servant (void)
}
static void
-nautilus_shell_initialize (NautilusShell *shell)
+nautilus_shell_init (NautilusShell *shell)
{
Nautilus_Shell corba_shell;
diff --git a/src/nautilus-sidebar-tabs.c b/src/nautilus-sidebar-tabs.c
index 21cd21599..2778b190c 100644
--- a/src/nautilus-sidebar-tabs.c
+++ b/src/nautilus-sidebar-tabs.c
@@ -33,7 +33,6 @@
#include <bonobo/bonobo-exception.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-util.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
@@ -127,8 +126,8 @@ struct NautilusSidebarTabsDetails {
/* headers */
-static void nautilus_sidebar_tabs_initialize_class (NautilusSidebarTabsClass *klass);
-static void nautilus_sidebar_tabs_initialize (NautilusSidebarTabs *pixmap);
+static void nautilus_sidebar_tabs_class_init (NautilusSidebarTabsClass *klass);
+static void nautilus_sidebar_tabs_init (NautilusSidebarTabs *pixmap);
static int nautilus_sidebar_tabs_expose (GtkWidget *widget,
GdkEventExpose *event);
static void nautilus_sidebar_tabs_destroy (GtkObject *object);
@@ -146,7 +145,7 @@ static void smooth_font_changed_callback (gpointer
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarTabs, nautilus_sidebar_tabs, GTK_TYPE_WIDGET)
static void
-nautilus_sidebar_tabs_initialize_class (NautilusSidebarTabsClass *class)
+nautilus_sidebar_tabs_class_init (NautilusSidebarTabsClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -274,7 +273,7 @@ smooth_font_changed_callback (gpointer callback_data)
/* initialize a newly allocated sidebar tabs object */
static void
-nautilus_sidebar_tabs_initialize (NautilusSidebarTabs *sidebar_tabs)
+nautilus_sidebar_tabs_init (NautilusSidebarTabs *sidebar_tabs)
{
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(sidebar_tabs), GTK_NO_WINDOW);
@@ -426,7 +425,7 @@ load_tab_piece (const char *piece_directory, const char *piece_name)
GdkPixbuf *pixbuf;
gchar *image_path;
image_path = g_strdup_printf ("%s/%s.png", piece_directory, piece_name);
- pixbuf = gdk_pixbuf_new_from_file (image_path);
+ pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
if (pixbuf == NULL) {
g_warning ("cant load tab piece: %s", image_path);
}
@@ -1356,7 +1355,7 @@ nautilus_sidebar_tabs_update_tab_item (NautilusSidebarTabs *sidebar_tabs, TabIte
if (tab_image_name != NULL) {
image_path = nautilus_theme_get_image_path (tab_image_name);
if (image_path != NULL) {
- tab_item->indicator_pixbuf = gdk_pixbuf_new_from_file (image_path);
+ tab_item->indicator_pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
}
}
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 3f2b59e38..a1956a1ed 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -71,9 +71,9 @@
#define MAX_TITLE_FONT_SIZE 20
#define TITLE_PADDING 4
-static void nautilus_sidebar_title_initialize_class (NautilusSidebarTitleClass *klass);
+static void nautilus_sidebar_title_class_init (NautilusSidebarTitleClass *klass);
static void nautilus_sidebar_title_destroy (GtkObject *object);
-static void nautilus_sidebar_title_initialize (NautilusSidebarTitle *pixmap);
+static void nautilus_sidebar_title_init (NautilusSidebarTitle *pixmap);
static void nautilus_sidebar_title_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void nautilus_sidebar_title_theme_changed (gpointer user_data);
@@ -103,7 +103,7 @@ struct NautilusSidebarTitleDetails {
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarTitle, nautilus_sidebar_title, gtk_vbox_get_type ())
static void
-nautilus_sidebar_title_initialize_class (NautilusSidebarTitleClass *class)
+nautilus_sidebar_title_class_init (NautilusSidebarTitleClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -193,7 +193,7 @@ non_smooth_font_changed_callback (gpointer callback_data)
}
static void
-nautilus_sidebar_title_initialize (NautilusSidebarTitle *sidebar_title)
+nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
{
sidebar_title->details = g_new0 (NautilusSidebarTitleDetails, 1);
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 54fd49b44..1ba30d262 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -94,8 +94,8 @@ struct NautilusSidebarDetails {
/* button assignments */
#define CONTEXTUAL_MENU_BUTTON 3
-static void nautilus_sidebar_initialize_class (GtkObjectClass *object_klass);
-static void nautilus_sidebar_initialize (GtkObject *object);
+static void nautilus_sidebar_class_init (GtkObjectClass *object_klass);
+static void nautilus_sidebar_init (GtkObject *object);
static void nautilus_sidebar_deactivate_panel (NautilusSidebar *sidebar);
static gboolean nautilus_sidebar_press_event (GtkWidget *widget,
GdkEventButton *event);
@@ -173,7 +173,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_
/* initializing the class object by installing the operations we override */
static void
-nautilus_sidebar_initialize_class (GtkObjectClass *object_klass)
+nautilus_sidebar_class_init (GtkObjectClass *object_klass)
{
GtkWidgetClass *widget_class;
@@ -193,16 +193,15 @@ nautilus_sidebar_initialize_class (GtkObjectClass *object_klass)
widget_class->realize = nautilus_sidebar_realize;
/* add the "location changed" signal */
- signals[LOCATION_CHANGED] = gtk_signal_new
+ signals[LOCATION_CHANGED] = g_signal_new
("location_changed",
- GTK_RUN_LAST,
- object_klass->type,
- GTK_SIGNAL_OFFSET (NautilusSidebarClass,
+ G_TYPE_FROM_CLASS (object_klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusSidebarClass,
location_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-
- gtk_object_class_add_signals (object_klass, signals, LAST_SIGNAL);
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
&confirm_trash_auto_value);
@@ -228,7 +227,7 @@ make_button_box (NautilusSidebar *sidebar)
/* initialize the instance's fields, create the necessary subviews, etc. */
static void
-nautilus_sidebar_initialize (GtkObject *object)
+nautilus_sidebar_init (GtkObject *object)
{
NautilusSidebar *sidebar;
GtkWidget* widget;
@@ -295,7 +294,7 @@ nautilus_sidebar_initialize (GtkObject *object)
/* prepare ourselves to receive dropped objects */
gtk_drag_dest_set (GTK_WIDGET (sidebar),
GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
- target_table, EEL_N_ELEMENTS (target_table),
+ target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
}
@@ -676,7 +675,7 @@ uri_is_local_image (const char *uri)
return FALSE;
}
- pixbuf = gdk_pixbuf_new_from_file (image_path);
+ pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
if (pixbuf == NULL) {
diff --git a/src/nautilus-signaller.c b/src/nautilus-signaller.c
index 403830f2d..98c42776f 100644
--- a/src/nautilus-signaller.c
+++ b/src/nautilus-signaller.c
@@ -46,8 +46,8 @@ static guint signals[LAST_SIGNAL];
static GtkObject *global_signaller = NULL;
static GtkType nautilus_signaller_get_type (void);
-static void nautilus_signaller_initialize_class (gpointer klass);
-static void nautilus_signaller_initialize (gpointer object,
+static void nautilus_signaller_class_init (gpointer klass);
+static void nautilus_signaller_init (gpointer object,
gpointer klass);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSignaller,
@@ -55,32 +55,32 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSignaller,
GTK_TYPE_OBJECT)
static void
-nautilus_signaller_initialize_class (gpointer klass)
+nautilus_signaller_class_init (gpointer klass)
{
GtkObjectClass *object_class;
object_class = GTK_OBJECT_CLASS (klass);
signals[HISTORY_LIST_CHANGED] =
- gtk_signal_new ("history_list_changed",
- GTK_RUN_LAST,
- object_class->type,
- 0,
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("history_list_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[EMBLEMS_CHANGED] =
- gtk_signal_new ("emblems_changed",
- GTK_RUN_LAST,
- object_class->type,
- 0,
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ g_signal_new ("emblems_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
}
static void
-nautilus_signaller_initialize (gpointer object, gpointer klass)
+nautilus_signaller_init (gpointer object, gpointer klass)
{
/* placeholder to allow use of boilerplate macro */
}
diff --git a/src/nautilus-simple-search-bar.c b/src/nautilus-simple-search-bar.c
index c3308dab8..9f20e02a7 100644
--- a/src/nautilus-simple-search-bar.c
+++ b/src/nautilus-simple-search-bar.c
@@ -54,8 +54,8 @@ static void nautilus_simple_search_bar_set_location (NautilusNaviga
static char * nautilus_search_uri_to_simple_search_criteria (const char *location);
static char * nautilus_simple_search_criteria_to_search_uri (const char *search_criteria);
-static void nautilus_simple_search_bar_initialize_class (NautilusSimpleSearchBarClass *class);
-static void nautilus_simple_search_bar_initialize (NautilusSimpleSearchBar *bar);
+static void nautilus_simple_search_bar_class_init (NautilusSimpleSearchBarClass *class);
+static void nautilus_simple_search_bar_init (NautilusSimpleSearchBar *bar);
static void nautilus_simple_search_bar_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSimpleSearchBar,
@@ -63,7 +63,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSimpleSearchBar,
NAUTILUS_TYPE_SEARCH_BAR)
static void
-nautilus_simple_search_bar_initialize_class (NautilusSimpleSearchBarClass *klass)
+nautilus_simple_search_bar_class_init (NautilusSimpleSearchBarClass *klass)
{
GTK_OBJECT_CLASS (klass)->destroy = nautilus_simple_search_bar_destroy;
@@ -93,7 +93,7 @@ update_simple_find_button_state (NautilusSimpleSearchBar *bar)
}
static void
-nautilus_simple_search_bar_initialize (NautilusSimpleSearchBar *bar)
+nautilus_simple_search_bar_init (NautilusSimpleSearchBar *bar)
{
bar->details = g_new0 (NautilusSimpleSearchBarDetails, 1);
}
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 05147dc5d..0990c89c9 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -116,8 +116,8 @@ static GList *history_list = NULL;
static GdkPixmap *mini_icon_pixmap;
static GdkBitmap *mini_icon_mask;
-static void nautilus_window_initialize_class (NautilusWindowClass *klass);
-static void nautilus_window_initialize (NautilusWindow *window);
+static void nautilus_window_class_init (NautilusWindowClass *klass);
+static void nautilus_window_init (NautilusWindow *window);
static void nautilus_window_destroy (GtkObject *object);
static void nautilus_window_set_arg (GtkObject *object,
GtkArg *arg,
@@ -149,7 +149,7 @@ unref_mini_icon (void)
}
static void
-nautilus_window_initialize_class (NautilusWindowClass *klass)
+nautilus_window_class_init (NautilusWindowClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -183,7 +183,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
if (filename != NULL) {
- pixbuf = gdk_pixbuf_new_from_file (filename);
+ pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
@@ -213,7 +213,7 @@ add_sidebar_panel_callback (const char *name,
}
static void
-nautilus_window_initialize (NautilusWindow *window)
+nautilus_window_init (NautilusWindow *window)
{
window->details = g_new0 (NautilusWindowDetails, 1);
diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h
index 0e764d3e3..fd49f4b7f 100644
--- a/src/nautilus-spatial-window.h
+++ b/src/nautilus-spatial-window.h
@@ -29,7 +29,7 @@
#ifndef NAUTILUS_WINDOW_H
#define NAUTILUS_WINDOW_H
-#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-window.h>
#include <eel/eel-glib-extensions.h>
#include <libnautilus-private/nautilus-bookmark.h>
#include <libnautilus-private/nautilus-view-identifier.h>
diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c
index 8ca4d8578..52351ce48 100644
--- a/src/nautilus-switchable-navigation-bar.c
+++ b/src/nautilus-switchable-navigation-bar.c
@@ -34,7 +34,6 @@
#include <gtk/gtklabel.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dock.h>
#include <libnautilus-private/nautilus-directory.h>
@@ -60,8 +59,8 @@ static guint signals[LAST_SIGNAL];
static char *nautilus_switchable_navigation_bar_get_location (NautilusNavigationBar *bar);
static void nautilus_switchable_navigation_bar_set_location (NautilusNavigationBar *bar,
const char *location);
-static void nautilus_switchable_navigation_bar_initialize_class (NautilusSwitchableNavigationBarClass *class);
-static void nautilus_switchable_navigation_bar_initialize (NautilusSwitchableNavigationBar *bar);
+static void nautilus_switchable_navigation_bar_class_init (NautilusSwitchableNavigationBarClass *class);
+static void nautilus_switchable_navigation_bar_init (NautilusSwitchableNavigationBar *bar);
static void nautilus_switchable_navigation_bar_destroy (GtkObject *object);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableNavigationBar,
@@ -69,7 +68,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableNavigationBar,
NAUTILUS_TYPE_NAVIGATION_BAR)
static void
-nautilus_switchable_navigation_bar_initialize_class (NautilusSwitchableNavigationBarClass *klass)
+nautilus_switchable_navigation_bar_class_init (NautilusSwitchableNavigationBarClass *klass)
{
GtkObjectClass *object_class;
@@ -78,16 +77,15 @@ nautilus_switchable_navigation_bar_initialize_class (NautilusSwitchableNavigatio
object_class = GTK_OBJECT_CLASS (klass);
navigation_bar_class = NAUTILUS_NAVIGATION_BAR_CLASS (klass);
- signals[MODE_CHANGED] = gtk_signal_new
+ signals[MODE_CHANGED] = g_signal_new
("mode_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusSwitchableNavigationBarClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusSwitchableNavigationBarClass,
mode_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, GTK_TYPE_INT);
object_class->destroy = nautilus_switchable_navigation_bar_destroy;
@@ -96,7 +94,7 @@ nautilus_switchable_navigation_bar_initialize_class (NautilusSwitchableNavigatio
}
static void
-nautilus_switchable_navigation_bar_initialize (NautilusSwitchableNavigationBar *bar)
+nautilus_switchable_navigation_bar_init (NautilusSwitchableNavigationBar *bar)
{
diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c
index bcd14bcd3..c422c1879 100644
--- a/src/nautilus-switchable-search-bar.c
+++ b/src/nautilus-switchable-search-bar.c
@@ -34,7 +34,6 @@
#include <gtk/gtkeventbox.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dock.h>
#include <libgnomeui/gnome-uidefs.h>
@@ -46,8 +45,8 @@ static void real_activate (NautilusNavigationBar *bar);
static void nautilus_switchable_search_bar_set_location (NautilusNavigationBar *bar,
const char *location);
static char * nautilus_switchable_search_bar_get_location (NautilusNavigationBar *bar);
-static void nautilus_switchable_search_bar_initialize_class (NautilusSwitchableSearchBarClass *class);
-static void nautilus_switchable_search_bar_initialize (NautilusSwitchableSearchBar *bar);
+static void nautilus_switchable_search_bar_class_init (NautilusSwitchableSearchBarClass *class);
+static void nautilus_switchable_search_bar_init (NautilusSwitchableSearchBar *bar);
static void nautilus_switchable_search_bar_destroy (GtkObject *object);
static NautilusSearchBarMode other_search_mode (NautilusSearchBarMode mode);
@@ -60,7 +59,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableSearchBar,
NAUTILUS_TYPE_SEARCH_BAR)
static void
-nautilus_switchable_search_bar_initialize_class (NautilusSwitchableSearchBarClass *klass)
+nautilus_switchable_search_bar_class_init (NautilusSwitchableSearchBarClass *klass)
{
NAUTILUS_NAVIGATION_BAR_CLASS (klass)->activate = real_activate;
NAUTILUS_NAVIGATION_BAR_CLASS (klass)->get_location = nautilus_switchable_search_bar_get_location;
@@ -90,7 +89,7 @@ search_bar_preference_changed_callback (gpointer user_data)
}
static void
-nautilus_switchable_search_bar_initialize (NautilusSwitchableSearchBar *bar)
+nautilus_switchable_search_bar_init (NautilusSwitchableSearchBar *bar)
{
}
diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c
index f1c65ed1d..8dc432af8 100644
--- a/src/nautilus-theme-selector.c
+++ b/src/nautilus-theme-selector.c
@@ -42,7 +42,6 @@
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libnautilus-private/nautilus-global-preferences.h>
@@ -76,8 +75,8 @@ typedef enum
static guint theme_selector_signals[LAST_SIGNAL];
/* GtkObjectClass methods */
-static void nautilus_theme_selector_initialize_class (NautilusThemeSelectorClass *theme_selector_class);
-static void nautilus_theme_selector_initialize (NautilusThemeSelector *theme_selector);
+static void nautilus_theme_selector_class_init (NautilusThemeSelectorClass *theme_selector_class);
+static void nautilus_theme_selector_init (NautilusThemeSelector *theme_selector);
static void theme_selector_destroy (GtkObject *object);
/* Private stuff */
@@ -104,7 +103,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusThemeSelector, nautilus_theme_selector, GT
/* NautilusThemeSelectorClass methods */
static void
-nautilus_theme_selector_initialize_class (NautilusThemeSelectorClass *theme_selector_class)
+nautilus_theme_selector_class_init (NautilusThemeSelectorClass *theme_selector_class)
{
GtkObjectClass *object_class;
@@ -114,15 +113,14 @@ nautilus_theme_selector_initialize_class (NautilusThemeSelectorClass *theme_sele
object_class->destroy = theme_selector_destroy;
/* Signals */
- theme_selector_signals[THEME_CHANGED] = gtk_signal_new ("theme_changed",
- GTK_RUN_LAST,
- object_class->type,
- 0,
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE,
- 0);
-
- gtk_object_class_add_signals (object_class, theme_selector_signals, LAST_SIGNAL);
+ theme_selector_signals[THEME_CHANGED] = g_signal_new
+ ("theme_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 0);
}
static void
@@ -147,7 +145,7 @@ make_widgets_same_size (GtkWidget *one, GtkWidget *two)
}
static void
-nautilus_theme_selector_initialize (NautilusThemeSelector *theme_selector)
+nautilus_theme_selector_init (NautilusThemeSelector *theme_selector)
{
GtkWidget *button_box;
GtkWidget *alignment_box;
diff --git a/src/nautilus-theme-selector.h b/src/nautilus-theme-selector.h
index f0fd292a7..9385ee591 100644
--- a/src/nautilus-theme-selector.h
+++ b/src/nautilus-theme-selector.h
@@ -30,7 +30,6 @@
#include <gtk/gtkvbox.h>
#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
G_BEGIN_DECLS
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index 3e03ad5cc..b2b412ff4 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -103,10 +103,10 @@ struct NautilusViewFrameDetails {
guint socket_gone_idle_id;
};
-static void nautilus_view_frame_initialize (NautilusViewFrame *view);
+static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (GtkObject *view);
static void nautilus_view_frame_finalize (GtkObject *view);
-static void nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass);
+static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_map (GtkWidget *view);
static void send_history (NautilusViewFrame *view);
@@ -140,7 +140,7 @@ nautilus_view_frame_queue_incoming_call (PortableServer_Servant servant,
}
static void
-nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
+nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -153,148 +153,163 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
widget_class->map = nautilus_view_frame_map;
- signals[CHANGE_SELECTION] = gtk_signal_new
+ signals[CHANGE_SELECTION] = g_signal_new
("change_selection",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
change_selection),
+ NULL, NULL,
gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
- signals[CHANGE_STATUS] = gtk_signal_new
+ G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ signals[CHANGE_STATUS] = g_signal_new
("change_status",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
change_status),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
- signals[FAILED] = gtk_signal_new
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+ signals[FAILED] = g_signal_new
("failed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
failed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[GET_HISTORY_LIST] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[GET_HISTORY_LIST] = g_signal_new
("get_history_list",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
get_history_list),
+ NULL, NULL,
eel_gtk_marshal_POINTER__NONE,
GTK_TYPE_POINTER, 0);
- signals[GO_BACK] = gtk_signal_new
+ signals[GO_BACK] = g_signal_new
("go_back",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
go_back),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[LOAD_COMPLETE] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[LOAD_COMPLETE] = g_signal_new
("load_complete",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
load_complete),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[LOAD_PROGRESS_CHANGED] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[LOAD_PROGRESS_CHANGED] = g_signal_new
("load_progress_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
load_progress_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[LOAD_UNDERWAY] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[LOAD_UNDERWAY] = g_signal_new
("load_underway",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
load_underway),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[OPEN_LOCATION_FORCE_NEW_WINDOW] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[OPEN_LOCATION_FORCE_NEW_WINDOW] = g_signal_new
("open_location_force_new_window",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
open_location_force_new_window),
- eel_gtk_marshal_NONE__STRING_POINTER,
- GTK_TYPE_NONE, 2, GTK_TYPE_STRING, GTK_TYPE_POINTER);
- signals[OPEN_LOCATION_IN_THIS_WINDOW] = gtk_signal_new
+ NULL, NULL,
+ eel_g_cclosure_marshal_VOID__STRING_POINTER,
+ G_TYPE_NONE, 2, G_TYPE_STRING, GTK_TYPE_POINTER);
+ signals[OPEN_LOCATION_IN_THIS_WINDOW] = g_signal_new
("open_location_in_this_window",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
open_location_in_this_window),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
- signals[OPEN_LOCATION_PREFER_EXISTING_WINDOW] = gtk_signal_new
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+ signals[OPEN_LOCATION_PREFER_EXISTING_WINDOW] = g_signal_new
("open_location_prefer_existing_window",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
open_location_in_this_window),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
- signals[REPORT_LOCATION_CHANGE] = gtk_signal_new
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+ signals[REPORT_LOCATION_CHANGE] = g_signal_new
("report_location_change",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
report_location_change),
- eel_gtk_marshal_NONE__STRING_POINTER_STRING,
- GTK_TYPE_NONE, 3, GTK_TYPE_STRING, GTK_TYPE_POINTER, GTK_TYPE_STRING);
- signals[REPORT_REDIRECT] = gtk_signal_new
+ NULL, NULL,
+ eel_g_cclosure_marshal_VOID__STRING_POINTER_STRING,
+ G_TYPE_NONE, 3, G_TYPE_STRING, GTK_TYPE_POINTER, G_TYPE_STRING);
+ signals[REPORT_REDIRECT] = g_signal_new
("report_redirect",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
report_redirect),
- eel_gtk_marshal_NONE__STRING_STRING_POINTER_STRING,
- GTK_TYPE_NONE, 4, GTK_TYPE_STRING, GTK_TYPE_STRING, GTK_TYPE_POINTER, GTK_TYPE_STRING);
- signals[TITLE_CHANGED] = gtk_signal_new
+ NULL, NULL,
+ eel_g_cclosure_marshal_VOID__STRING_STRING_POINTER_STRING,
+ G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, GTK_TYPE_POINTER, G_TYPE_STRING);
+ signals[TITLE_CHANGED] = g_signal_new
("title_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
title_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[VIEW_LOADED] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[VIEW_LOADED] = g_signal_new
("view_loaded",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
view_loaded),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[ZOOM_LEVEL_CHANGED] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[ZOOM_LEVEL_CHANGED] = g_signal_new
("zoom_level_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
zoom_level_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
- signals[ZOOM_PARAMETERS_CHANGED] = gtk_signal_new
+ G_TYPE_NONE, 0);
+ signals[ZOOM_PARAMETERS_CHANGED] = g_signal_new
("zoom_parameters_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusViewFrameClass,
zoom_parameters_changed),
+ NULL, NULL,
gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ G_TYPE_NONE, 0);
}
static void
-nautilus_view_frame_initialize (NautilusViewFrame *view)
+nautilus_view_frame_init (NautilusViewFrame *view)
{
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 05101876a..4c8c33d71 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -33,7 +33,6 @@
#ifndef NAUTILUS_VIEW_FRAME_H
#define NAUTILUS_VIEW_FRAME_H
-#include <bonobo/bonobo-object-client.h>
#include <bonobo/bonobo-ui-container.h>
#include <bonobo/bonobo-zoomable-frame.h>
#include <eel/eel-generous-bin.h>
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index eee803632..4509bb120 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -42,7 +42,6 @@
#include <gtk/gtkframe.h>
#include <gtk/gtktogglebutton.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-preferences.h>
#include <libnautilus-private/nautilus-bonobo-extensions.h>
#include <libnautilus-private/nautilus-bookmark.h>
#include <libnautilus-private/nautilus-file-utilities.h>
@@ -272,7 +271,7 @@ set_up_special_bonobo_button (NautilusWindow *window,
if (icon_file_name == NULL) {
pixbuf = get_pixbuf_for_xml_node (window, control_path);
} else {
- pixbuf = gdk_pixbuf_new_from_file (icon_file_name);
+ pixbuf = gdk_pixbuf_new_from_file (icon_file_name, NULL);
g_free (icon_file_name);
}
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 05147dc5d..0990c89c9 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -116,8 +116,8 @@ static GList *history_list = NULL;
static GdkPixmap *mini_icon_pixmap;
static GdkBitmap *mini_icon_mask;
-static void nautilus_window_initialize_class (NautilusWindowClass *klass);
-static void nautilus_window_initialize (NautilusWindow *window);
+static void nautilus_window_class_init (NautilusWindowClass *klass);
+static void nautilus_window_init (NautilusWindow *window);
static void nautilus_window_destroy (GtkObject *object);
static void nautilus_window_set_arg (GtkObject *object,
GtkArg *arg,
@@ -149,7 +149,7 @@ unref_mini_icon (void)
}
static void
-nautilus_window_initialize_class (NautilusWindowClass *klass)
+nautilus_window_class_init (NautilusWindowClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -183,7 +183,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
filename = nautilus_pixmap_file ("nautilus-mini-logo.png");
if (filename != NULL) {
- pixbuf = gdk_pixbuf_new_from_file (filename);
+ pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
@@ -213,7 +213,7 @@ add_sidebar_panel_callback (const char *name,
}
static void
-nautilus_window_initialize (NautilusWindow *window)
+nautilus_window_init (NautilusWindow *window)
{
window->details = g_new0 (NautilusWindowDetails, 1);
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 0e764d3e3..fd49f4b7f 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -29,7 +29,7 @@
#ifndef NAUTILUS_WINDOW_H
#define NAUTILUS_WINDOW_H
-#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-window.h>
#include <eel/eel-glib-extensions.h>
#include <libnautilus-private/nautilus-bookmark.h>
#include <libnautilus-private/nautilus-view-identifier.h>
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 418f7815f..82ad3185a 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -28,7 +28,6 @@
#include <config.h>
#include "nautilus-zoom-control.h"
-#include <libgnome/gnome-defs.h>
#include <math.h>
#include <gnome.h>
@@ -88,8 +87,8 @@ struct NautilusZoomControlDetails {
static guint signals[LAST_SIGNAL];
-static void nautilus_zoom_control_initialize_class (NautilusZoomControlClass *klass);
-static void nautilus_zoom_control_initialize (NautilusZoomControl *zoom_control);
+static void nautilus_zoom_control_class_init (NautilusZoomControlClass *klass);
+static void nautilus_zoom_control_init (NautilusZoomControl *zoom_control);
static void nautilus_zoom_control_destroy (GtkObject *object);
static void nautilus_zoom_control_draw (GtkWidget *widget,
GdkRectangle *box);
@@ -118,7 +117,7 @@ void draw_number (GtkWidget *widget,
EEL_DEFINE_CLASS_BOILERPLATE (NautilusZoomControl, nautilus_zoom_control, GTK_TYPE_EVENT_BOX)
static void
-nautilus_zoom_control_initialize_class (NautilusZoomControlClass *zoom_control_class)
+nautilus_zoom_control_class_init (NautilusZoomControlClass *zoom_control_class)
{
GtkObjectClass *object_class = GTK_OBJECT_CLASS (zoom_control_class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (zoom_control_class);
@@ -134,44 +133,46 @@ nautilus_zoom_control_initialize_class (NautilusZoomControlClass *zoom_control_c
widget_class->size_allocate = nautilus_zoom_control_size_allocate;
signals[ZOOM_IN] =
- gtk_signal_new ("zoom_in",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusZoomControlClass,
+ g_signal_new ("zoom_in",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusZoomControlClass,
zoom_in),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[ZOOM_OUT] =
- gtk_signal_new ("zoom_out",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusZoomControlClass,
+ g_signal_new ("zoom_out",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusZoomControlClass,
zoom_out),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
signals[ZOOM_TO_LEVEL] =
- gtk_signal_new ("zoom_to_level",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusZoomControlClass,
+ g_signal_new ("zoom_to_level",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusZoomControlClass,
zoom_to_level),
- eel_gtk_marshal_NONE__DOUBLE,
- GTK_TYPE_NONE,
+ NULL, NULL,
+ eel_gtk_marshal_NONE__DOUBLE,
+ G_TYPE_NONE,
1,
GTK_TYPE_DOUBLE);
signals[ZOOM_TO_FIT] =
- gtk_signal_new ("zoom_to_fit",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (NautilusZoomControlClass,
+ g_signal_new ("zoom_to_fit",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NautilusZoomControlClass,
zoom_to_fit),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+ NULL, NULL,
+ gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
}
static void
@@ -205,7 +206,7 @@ get_zoom_width (NautilusZoomControl *zoom_control)
}
static void
-nautilus_zoom_control_initialize (NautilusZoomControl *zoom_control)
+nautilus_zoom_control_init (NautilusZoomControl *zoom_control)
{
GtkWidget *widget = GTK_WIDGET (zoom_control);
int zoom_width;
@@ -501,7 +502,7 @@ load_themed_image (const char *file_name)
image_path = nautilus_theme_get_image_path (file_name);
if (image_path) {
- pixbuf = gdk_pixbuf_new_from_file (image_path);
+ pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
return pixbuf;
}
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);