diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
| commit | 5abcc1995419a91bebe2e42a5218a374e36533c3 (patch) | |
| tree | 2f6c9699dc992039a973b0bd058aebfa2d820669 /src | |
| parent | b36a91ca55636af4137615a88c6e70a6dffe7802 (diff) | |
| download | nautilus-5abcc1995419a91bebe2e42a5218a374e36533c3.tar.gz | |
More GNOME 2 work. We now compile up to libnautilus-private and I'm
* Lots of files:
More GNOME 2 work. We now compile up to libnautilus-private and
I'm working my way through the files in there. Also changed all
the initialize_class and initialize to class_init and init.
Diffstat (limited to 'src')
47 files changed, 452 insertions, 454 deletions
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 (©_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; } |