diff options
Diffstat (limited to 'libnautilus-extensions')
44 files changed, 183 insertions, 154 deletions
diff --git a/libnautilus-extensions/nautilus-background-canvas-group.c b/libnautilus-extensions/nautilus-background-canvas-group.c index 52d250f05..09bbd0f6e 100644 --- a/libnautilus-extensions/nautilus-background-canvas-group.c +++ b/libnautilus-extensions/nautilus-background-canvas-group.c @@ -147,7 +147,7 @@ nautilus_background_canvas_group_update (GnomeCanvasItem *item, GTK_WIDGET (item->canvas)->allocation.width, GTK_WIDGET (item->canvas)->allocation.height); - NAUTILUS_CALL_PARENT_CLASS (GNOME_CANVAS_ITEM_CLASS, update, (item, affine, clip_path, flags)); + NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update, (item, affine, clip_path, flags)); } static void @@ -193,7 +193,7 @@ nautilus_background_canvas_group_draw (GnomeCanvasItem *item, /* Call through to the GnomeCanvasGroup implementation, which * will draw all the canvas items. */ - NAUTILUS_CALL_PARENT_CLASS (GNOME_CANVAS_ITEM_CLASS, draw, (item, drawable, x, y, width, height)); + NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, draw, (item, drawable, x, y, width, height)); } @@ -221,5 +221,5 @@ nautilus_background_canvas_group_render (GnomeCanvasItem *item, GnomeCanvasBuf * /* Call through to the GnomeCanvasGroup implementation, which will draw all * the canvas items. */ - NAUTILUS_CALL_PARENT_CLASS (GNOME_CANVAS_ITEM_CLASS, render, (item, buffer)); + NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, render, (item, buffer)); } diff --git a/libnautilus-extensions/nautilus-background.c b/libnautilus-extensions/nautilus-background.c index b21153420..4e253fcd1 100644 --- a/libnautilus-extensions/nautilus-background.c +++ b/libnautilus-extensions/nautilus-background.c @@ -200,7 +200,7 @@ nautilus_background_destroy (GtkObject *object) nautilus_background_remove_current_image (background); g_free (background->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* handle the combine mode getting and setting */ diff --git a/libnautilus-extensions/nautilus-bookmark.c b/libnautilus-extensions/nautilus-bookmark.c index 2644e165f..ef1b4b921 100644 --- a/libnautilus-extensions/nautilus-bookmark.c +++ b/libnautilus-extensions/nautilus-bookmark.c @@ -58,8 +58,6 @@ struct NautilusBookmarkDetails NautilusFile *file; }; - - static void nautilus_bookmark_connect_file (NautilusBookmark *file); static void nautilus_bookmark_disconnect_file (NautilusBookmark *file); static void nautilus_bookmark_initialize_class (NautilusBookmarkClass *class); @@ -86,10 +84,9 @@ nautilus_bookmark_destroy (GtkObject *object) g_free (bookmark->details); /* Chain up */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } - /* Initialization. */ static void @@ -119,7 +116,6 @@ nautilus_bookmark_initialize (NautilusBookmark *bookmark) bookmark->details = g_new0 (NautilusBookmarkDetails, 1); } - /** * nautilus_bookmark_compare_with: * diff --git a/libnautilus-extensions/nautilus-caption.c b/libnautilus-extensions/nautilus-caption.c index 9b2698343..54f0f7051 100644 --- a/libnautilus-extensions/nautilus-caption.c +++ b/libnautilus-extensions/nautilus-caption.c @@ -111,14 +111,14 @@ nautilus_caption_destroy (GtkObject* object) g_free (caption->detail); /* Chain */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* GtkObjectClass methods */ static void nautilus_font_picker_show_all (GtkWidget *widget) { - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, show_all, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show_all, (widget)); /* Now update the title visibility */ update_title (NAUTILUS_CAPTION (widget)); diff --git a/libnautilus-extensions/nautilus-clickable-image.c b/libnautilus-extensions/nautilus-clickable-image.c index 9cfbced68..b854d0a90 100644 --- a/libnautilus-extensions/nautilus-clickable-image.c +++ b/libnautilus-extensions/nautilus-clickable-image.c @@ -161,7 +161,7 @@ nautilus_clickable_image_destroy (GtkObject *object) g_free (clickable_image->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -198,7 +198,7 @@ nautilus_clickable_image_realize (GtkWidget *widget) clickable_image = NAUTILUS_CLICKABLE_IMAGE (widget); /* Chain realize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); windowed_ancestor = nautilus_gtk_widget_find_windowed_ancestor (widget); g_assert (GTK_IS_WIDGET (windowed_ancestor)); @@ -478,7 +478,8 @@ nautilus_clickable_image_expose_event (GtkWidget *widget, clickable_image = NAUTILUS_CLICKABLE_IMAGE (widget); /* Chain expose */ - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, expose_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, expose_event, (widget, event)); } static void diff --git a/libnautilus-extensions/nautilus-debug-drawing.c b/libnautilus-extensions/nautilus-debug-drawing.c index 728f77788..dcdec1548 100644 --- a/libnautilus-extensions/nautilus-debug-drawing.c +++ b/libnautilus-extensions/nautilus-debug-drawing.c @@ -112,7 +112,7 @@ debug_pixbuf_viewer_destroy (GtkObject *object) nautilus_gdk_pixbuf_unref_if_not_null (viewer->pixbuf); viewer->pixbuf = NULL; - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-directory-metafile-monitor.c b/libnautilus-extensions/nautilus-directory-metafile-monitor.c index b7fecd6df..5bae8862e 100644 --- a/libnautilus-extensions/nautilus-directory-metafile-monitor.c +++ b/libnautilus-extensions/nautilus-directory-metafile-monitor.c @@ -111,7 +111,7 @@ destroy (GtkObject *object) monitor = NAUTILUS_METAFILE_MONITOR (object); g_free (monitor->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusMetafileMonitor * diff --git a/libnautilus-extensions/nautilus-directory.c b/libnautilus-extensions/nautilus-directory.c index 82d8d28db..3d46e3d7c 100644 --- a/libnautilus-extensions/nautilus-directory.c +++ b/libnautilus-extensions/nautilus-directory.c @@ -208,7 +208,7 @@ nautilus_directory_destroy (GtkObject *object) g_free (directory->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -460,7 +460,7 @@ nautilus_directory_get_name_for_self_as_new_file (NautilusDirectory *directory) { g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_DIRECTORY_CLASS, directory, get_name_for_self_as_new_file, (directory)); } @@ -563,7 +563,7 @@ nautilus_directory_are_all_files_seen (NautilusDirectory *directory) { g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_DIRECTORY_CLASS, directory, are_all_files_seen, (directory)); } @@ -1433,7 +1433,7 @@ nautilus_directory_contains_file (NautilusDirectory *directory, return FALSE; } - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_DIRECTORY_CLASS, directory, contains_file, (directory, file)); } @@ -1474,7 +1474,7 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory, g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory)); g_return_if_fail (callback != NULL); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_DIRECTORY_CLASS, directory, call_when_ready, (directory, file_attributes, callback, callback_data)); @@ -1489,7 +1489,7 @@ nautilus_directory_cancel_callback (NautilusDirectory *directory, g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory)); g_return_if_fail (callback != NULL); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_DIRECTORY_CLASS, directory, cancel_callback, (directory, callback, callback_data)); } @@ -1504,7 +1504,7 @@ nautilus_directory_file_monitor_add (NautilusDirectory *directory, g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory)); g_return_if_fail (client != NULL); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_DIRECTORY_CLASS, directory, file_monitor_add, (directory, client, monitor_hidden_files, @@ -1519,7 +1519,7 @@ nautilus_directory_file_monitor_remove (NautilusDirectory *directory, g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory)); g_return_if_fail (client != NULL); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_DIRECTORY_CLASS, directory, file_monitor_remove, (directory, client)); } @@ -1529,7 +1529,7 @@ nautilus_directory_force_reload (NautilusDirectory *directory) { g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_DIRECTORY_CLASS, directory, force_reload, (directory)); } @@ -1539,7 +1539,7 @@ nautilus_directory_is_not_empty (NautilusDirectory *directory) { g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_DIRECTORY_CLASS, directory, is_not_empty, (directory)); } diff --git a/libnautilus-extensions/nautilus-druid-page-eazel.c b/libnautilus-extensions/nautilus-druid-page-eazel.c index 39fadc869..a2c1d8adf 100644 --- a/libnautilus-extensions/nautilus-druid-page-eazel.c +++ b/libnautilus-extensions/nautilus-druid-page-eazel.c @@ -142,11 +142,11 @@ nautilus_druid_page_eazel_destroy(GtkObject *object) druid_page_eazel->widget = NULL; /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void -nautilus_druid_page_eazel_finalize(GtkObject *object) +nautilus_druid_page_eazel_finalize (GtkObject *object) { NautilusDruidPageEazel *druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL(object); @@ -155,7 +155,7 @@ nautilus_druid_page_eazel_finalize(GtkObject *object) druid_page_eazel->details = NULL; /* Chain finalize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, finalize, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object)); } static void @@ -389,8 +389,8 @@ static void nautilus_druid_page_eazel_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, - (widget, allocation)); + NAUTILUS_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, @@ -409,8 +409,8 @@ nautilus_druid_page_eazel_size_request(GtkWidget *widget, druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, - (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, + (widget, requisition)); if (druid_page_eazel->widget) { GtkRequisition child_requisition; diff --git a/libnautilus-extensions/nautilus-ellipsizing-label.c b/libnautilus-extensions/nautilus-ellipsizing-label.c index 28e537178..1903f3774 100644 --- a/libnautilus-extensions/nautilus-ellipsizing-label.c +++ b/libnautilus-extensions/nautilus-ellipsizing-label.c @@ -128,7 +128,7 @@ nautilus_ellipsizing_label_set_text (NautilusEllipsizingLabel *label, static void real_size_request (GtkWidget *widget, GtkRequisition *requisition) { - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition)); /* Don't demand any particular width; will draw ellipsized into whatever size we're given */ requisition->width = 0; @@ -139,7 +139,7 @@ real_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { recompute_ellipsized_text (NAUTILUS_ELLIPSIZING_LABEL (widget), allocation->width); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); } static void @@ -147,6 +147,6 @@ real_style_set (GtkWidget *widget, GtkStyle *previous_style) { recompute_ellipsized_text (NAUTILUS_ELLIPSIZING_LABEL (widget), widget->allocation.width); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, style_set, (widget, previous_style)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style)); } diff --git a/libnautilus-extensions/nautilus-entry.c b/libnautilus-extensions/nautilus-entry.c index 338af15b2..10af50e5d 100644 --- a/libnautilus-extensions/nautilus-entry.c +++ b/libnautilus-extensions/nautilus-entry.c @@ -156,7 +156,7 @@ nautilus_entry_destroy (GtkObject *object) entry = NAUTILUS_ENTRY (object); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -223,9 +223,8 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event) obscure_cursor (entry); - return_code = NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, - key_press_event, - (widget, event)); + return_code = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, key_press_event, (widget, event)); gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]); return return_code; @@ -256,7 +255,8 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event) old_start_pos = GTK_EDITABLE (widget)->selection_start_pos; old_end_pos = GTK_EDITABLE (widget)->selection_end_pos; - return_code = NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, motion_notify_event, (widget, event)); + return_code = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, motion_notify_event, (widget, event)); if (GTK_EDITABLE (widget)->selection_start_pos != old_start_pos || GTK_EDITABLE (widget)->selection_end_pos != old_end_pos) { gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]); @@ -340,8 +340,8 @@ nautilus_entry_set_selection (GtkEditable *editable, gint end_pos) { - NAUTILUS_CALL_PARENT_CLASS (GTK_EDITABLE_CLASS, set_selection, - (editable, start_pos, end_pos)); + NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection, + (editable, start_pos, end_pos)); gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]); } @@ -358,8 +358,8 @@ nautilus_entry_insert_text (GtkEditable *editable, const gchar *text, gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]); } - NAUTILUS_CALL_PARENT_CLASS (GTK_EDITABLE_CLASS, insert_text, - (editable, text, length, position)); + NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, + (editable, text, length, position)); gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]); } @@ -378,8 +378,8 @@ nautilus_entry_delete_text (GtkEditable *editable, gint start_pos, gint end_pos) gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]); } - NAUTILUS_CALL_PARENT_CLASS (GTK_EDITABLE_CLASS, delete_text, - (editable, start_pos, end_pos)); + NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, + (editable, start_pos, end_pos)); gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]); } @@ -393,17 +393,15 @@ nautilus_entry_delete_text (GtkEditable *editable, gint start_pos, gint end_pos) * gtk+/gtkselection.c, gtk_selection_clear. */ static gboolean -nautilus_entry_selection_clear (GtkWidget *widget, +nautilus_entry_selection_clear (GtkWidget *widget, GdkEventSelection *event) { - g_return_val_if_fail (NAUTILUS_IS_ENTRY (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - if (gdk_selection_owner_get (event->selection) == widget->window) { - return FALSE; - } - - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, - selection_clear_event, - (widget, event)); + g_return_val_if_fail (NAUTILUS_IS_ENTRY (widget), FALSE); + + if (gdk_selection_owner_get (event->selection) == widget->window) { + return FALSE; + } + + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, selection_clear_event, (widget, event)); } diff --git a/libnautilus-extensions/nautilus-file.c b/libnautilus-extensions/nautilus-file.c index af90aa02a..26aac564b 100644 --- a/libnautilus-extensions/nautilus-file.c +++ b/libnautilus-extensions/nautilus-file.c @@ -438,7 +438,7 @@ destroy (GtkObject *object) g_free (file->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } @@ -2043,7 +2043,7 @@ nautilus_file_monitor_add (NautilusFile *file, g_return_if_fail (NAUTILUS_IS_FILE (file)); g_return_if_fail (client != NULL); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_FILE_CLASS, file, monitor_add, (file, client, attributes)); } @@ -2055,7 +2055,7 @@ nautilus_file_monitor_remove (NautilusFile *file, g_return_if_fail (NAUTILUS_IS_FILE (file)); g_return_if_fail (client != NULL); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_FILE_CLASS, file, monitor_remove, (file, client)); } @@ -2138,8 +2138,9 @@ nautilus_file_get_date (NautilusFile *file, g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); - return NAUTILUS_CALL_VIRTUAL (NAUTILUS_FILE_CLASS, file, - get_date, (file, date_type, date)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (NAUTILUS_FILE_CLASS, file, + get_date, (file, date_type, date)); } static char * @@ -2151,8 +2152,9 @@ nautilus_file_get_where_string (NautilusFile *file) g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); - return NAUTILUS_CALL_VIRTUAL (NAUTILUS_FILE_CLASS, file, - get_where_string, (file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (NAUTILUS_FILE_CLASS, file, + get_where_string, (file)); } /** @@ -2349,7 +2351,7 @@ nautilus_file_get_directory_item_count (NautilusFile *file, return FALSE; } - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_FILE_CLASS, file, get_item_count, (file, count, count_unreadable)); } @@ -2398,7 +2400,7 @@ nautilus_file_get_deep_counts (NautilusFile *file, return file->details->deep_counts_status; } - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_FILE_CLASS, file, get_deep_counts, (file, directory_count, @@ -3804,7 +3806,8 @@ nautilus_file_get_file_type (NautilusFile *file) if (file == NULL) { return GNOME_VFS_FILE_TYPE_UNKNOWN; } - return NAUTILUS_CALL_VIRTUAL (NAUTILUS_FILE_CLASS, file, get_file_type, (file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (NAUTILUS_FILE_CLASS, file, get_file_type, (file)); } /** @@ -4297,7 +4300,7 @@ nautilus_file_check_if_ready (NautilusFile *file, g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (NAUTILUS_FILE_CLASS, file, check_if_ready, (file, file_attributes)); } @@ -4318,7 +4321,7 @@ nautilus_file_call_when_ready (NautilusFile *file, g_return_if_fail (NAUTILUS_IS_FILE (file)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_FILE_CLASS, file, call_when_ready, (file, file_attributes, callback, callback_data)); @@ -4337,7 +4340,7 @@ nautilus_file_cancel_call_when_ready (NautilusFile *file, g_return_if_fail (NAUTILUS_IS_FILE (file)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (NAUTILUS_FILE_CLASS, file, cancel_call_when_ready, (file, callback, callback_data)); } diff --git a/libnautilus-extensions/nautilus-font-factory.c b/libnautilus-extensions/nautilus-font-factory.c index 4da634c0b..9c1bbb637 100644 --- a/libnautilus-extensions/nautilus-font-factory.c +++ b/libnautilus-extensions/nautilus-font-factory.c @@ -164,7 +164,7 @@ destroy (GtkObject *object) g_hash_table_foreach (factory->fonts, free_one_hash_node, NULL); g_hash_table_destroy (factory->fonts); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static FontHashNode * diff --git a/libnautilus-extensions/nautilus-font-picker.c b/libnautilus-extensions/nautilus-font-picker.c index 068102c7e..ffe2639d5 100644 --- a/libnautilus-extensions/nautilus-font-picker.c +++ b/libnautilus-extensions/nautilus-font-picker.c @@ -194,7 +194,7 @@ nautilus_font_picker_destroy (GtkObject* object) g_free (font_picker->detail); /* Chain */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-gtk-macros.h b/libnautilus-extensions/nautilus-gtk-macros.h index 09ac5ea91..a8d12856e 100644 --- a/libnautilus-extensions/nautilus-gtk-macros.h +++ b/libnautilus-extensions/nautilus-gtk-macros.h @@ -2,7 +2,7 @@ nautilus-gtk-macros.h: Macros to reduce boilerplate when using GTK. - Copyright (C) 1999, 2000 Eazel, Inc. + Copyright (C) 1999, 2000, 2001 Eazel, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -26,6 +26,8 @@ #ifndef NAUTILUS_GTK_MACROS_H #define NAUTILUS_GTK_MACROS_H +#include <glib.h> + /* Define a parent_class global and a get_type function for a GTK class. Since this is boilerplate, it's better not to repeat it over and over again. Called like this: @@ -71,20 +73,38 @@ class_name_in_function_format##_get_type (void) * typo. Depends on the parent class pointer having the conventional * name "parent_class" as the boilerplate macro above does it. */ -#define NAUTILUS_CALL_PARENT_CLASS(parent_class_cast_macro, signal, parameters) \ - \ -(parent_class_cast_macro (parent_class)->signal == NULL) \ - ? 0 \ +#define NAUTILUS_CALL_PARENT(parent_class_cast_macro, signal, parameters) \ + \ +G_STMT_START { \ + if (parent_class_cast_macro (parent_class)->signal != NULL) { \ + (* parent_class_cast_macro (parent_class)->signal) parameters; \ + } \ +} G_STMT_END + +/* Same thing, for functions with a return value. */ +#define NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE(parent_class_cast_macro, signal, parameters) \ + \ +(parent_class_cast_macro (parent_class)->signal == NULL) \ + ? 0 \ : ((* parent_class_cast_macro (parent_class)->signal) parameters) /* Call a virtual function. Useful when the virtual function is not a * signal, otherwise you want to gtk_signal emit. Nice because it * documents what it's doing and there is less chance for a typo. */ -#define NAUTILUS_CALL_VIRTUAL(class_cast_macro, object, signal, parameters) \ - \ -(class_cast_macro (GTK_OBJECT (object)->klass)->signal == NULL) \ - ? 0 \ +#define NAUTILUS_CALL_METHOD(class_cast_macro, object, signal, parameters) \ + \ +G_STMT_START { \ + if (class_cast_macro (GTK_OBJECT (object)->klass)->signal != NULL) { \ + (* class_cast_macro (GTK_OBJECT (object)->klass)->signal) parameters; \ + } \ +} G_STMT_END + +/* Same thing, for functions with a return value. */ +#define NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE(class_cast_macro, object, signal, parameters) \ + \ +(class_cast_macro (GTK_OBJECT (object)->klass)->signal == NULL) \ + ? 0 \ : ((* class_cast_macro (GTK_OBJECT (object)->klass)->signal) parameters) #ifndef G_DISABLE_ASSERT diff --git a/libnautilus-extensions/nautilus-horizontal-splitter.c b/libnautilus-extensions/nautilus-horizontal-splitter.c index fa5ccfd78..676e39a8d 100644 --- a/libnautilus-extensions/nautilus-horizontal-splitter.c +++ b/libnautilus-extensions/nautilus-horizontal-splitter.c @@ -94,7 +94,7 @@ nautilus_horizontal_splitter_initialize (NautilusHorizontalSplitter *horizontal_ /* GtkObjectClass methods */ static void -nautilus_horizontal_splitter_destroy(GtkObject *object) +nautilus_horizontal_splitter_destroy (GtkObject *object) { NautilusHorizontalSplitter *horizontal_splitter; @@ -103,7 +103,7 @@ nautilus_horizontal_splitter_destroy(GtkObject *object) g_free (horizontal_splitter->details); /* Chain */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -340,7 +340,8 @@ nautilus_horizontal_splitter_button_press (GtkWidget *widget, GdkEventButton *ev splitter->details->down_time = event->time; } - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, button_press_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, button_press_event, (widget, event)); } diff --git a/libnautilus-extensions/nautilus-icon-canvas-item.c b/libnautilus-extensions/nautilus-icon-canvas-item.c index 2fa3496d8..d5c46a7d4 100644 --- a/libnautilus-extensions/nautilus-icon-canvas-item.c +++ b/libnautilus-extensions/nautilus-icon-canvas-item.c @@ -319,7 +319,7 @@ nautilus_icon_canvas_item_destroy (GtkObject *object) g_free (details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* Currently we require pixbufs in this format (for hit testing). @@ -634,8 +634,8 @@ nautilus_icon_canvas_item_update (GnomeCanvasItem *item, { nautilus_icon_canvas_item_update_bounds (NAUTILUS_ICON_CANVAS_ITEM (item)); nautilus_gnome_canvas_item_request_redraw (item); - NAUTILUS_CALL_PARENT_CLASS (GNOME_CANVAS_ITEM_CLASS, update, - (item, affine, clip_path, flags)); + NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update, + (item, affine, clip_path, flags)); } /* Rendering */ diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c index dcee6e34a..1a4543444 100644 --- a/libnautilus-extensions/nautilus-icon-container.c +++ b/libnautilus-extensions/nautilus-icon-container.c @@ -2303,7 +2303,7 @@ destroy (GtkObject *object) g_free (container->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* GtkWidget methods. */ @@ -2333,7 +2333,7 @@ size_allocate (GtkWidget *widget, need_layout_redone = TRUE; } - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); container->details->has_been_allocated = TRUE; @@ -2348,7 +2348,7 @@ realize (GtkWidget *widget) GtkStyle *style; GtkWindow *window; - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); style = gtk_style_copy (gtk_widget_get_style (widget)); style->bg[GTK_STATE_NORMAL] = style->base[GTK_STATE_NORMAL]; @@ -2376,7 +2376,7 @@ unrealize (GtkWidget *widget) window = GTK_WINDOW (gtk_widget_get_toplevel (widget)); gtk_window_set_focus (window, NULL); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, unrealize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); } static gboolean @@ -2423,7 +2423,8 @@ button_press_event (GtkWidget *widget, nautilus_icon_container_flush_typeselect_state (container); /* Invoke the canvas event handler and see if an item picks up the event. */ - clicked_on_icon = NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, button_press_event, (widget, event)); + clicked_on_icon = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, button_press_event, (widget, event)); /* Move focus to icon container, unless we're still renaming (to avoid exiting * renaming mode) @@ -2728,7 +2729,8 @@ button_release_event (GtkWidget *widget, return TRUE; } - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, button_release_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, button_release_event, (widget, event)); } static int @@ -2793,7 +2795,8 @@ motion_notify_event (GtkWidget *widget, } } - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, motion_notify_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, motion_notify_event, (widget, event)); } void @@ -2953,7 +2956,8 @@ key_press_event (GtkWidget *widget, } if (!handled) { - handled = NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, key_press_event, (widget, event)); + handled = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, key_press_event, (widget, event)); } return handled; diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c index 7fc4b8089..07e805ee3 100644 --- a/libnautilus-extensions/nautilus-icon-factory.c +++ b/libnautilus-extensions/nautilus-icon-factory.c @@ -587,7 +587,7 @@ nautilus_icon_factory_destroy (GtkObject *object) g_free (factory->theme_name); g_free (factory->default_theme_name); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static gboolean diff --git a/libnautilus-extensions/nautilus-image-table.c b/libnautilus-extensions/nautilus-image-table.c index 0f77036f2..0e1f1f3f8 100644 --- a/libnautilus-extensions/nautilus-image-table.c +++ b/libnautilus-extensions/nautilus-image-table.c @@ -226,7 +226,7 @@ nautilus_image_table_destroy (GtkObject *object) g_free (image_table->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* GtkWidgetClass methods */ @@ -249,7 +249,8 @@ nautilus_image_table_expose_event (GtkWidget *widget, image_table_clear_dirty_areas (image_table); } - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, expose_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, expose_event, (widget, event)); } static void @@ -263,7 +264,7 @@ nautilus_image_table_realize (GtkWidget *widget) image_table = NAUTILUS_IMAGE_TABLE (widget); /* Chain realize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); windowed_ancestor = nautilus_gtk_widget_find_windowed_ancestor (widget); g_assert (GTK_IS_WIDGET (windowed_ancestor)); @@ -322,7 +323,7 @@ nautilus_image_table_unrealize (GtkWidget *widget) } /* Chain unrealize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, unrealize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); } /* GtkContainerClass methods */ @@ -345,7 +346,7 @@ nautilus_image_table_remove (GtkContainer *container, image_table->details->child_being_pressed = NULL; } - NAUTILUS_CALL_PARENT_CLASS (GTK_CONTAINER_CLASS, remove, (container, child)); + NAUTILUS_CALL_PARENT (GTK_CONTAINER_CLASS, remove, (container, child)); } static GtkType diff --git a/libnautilus-extensions/nautilus-image.c b/libnautilus-extensions/nautilus-image.c index 36251e4ee..d1922d59d 100644 --- a/libnautilus-extensions/nautilus-image.c +++ b/libnautilus-extensions/nautilus-image.c @@ -238,7 +238,7 @@ nautilus_image_destroy (GtkObject *object) g_free (image->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-keep-last-vertical-box.c b/libnautilus-extensions/nautilus-keep-last-vertical-box.c index 7b0fe4aca..c773fc1c8 100644 --- a/libnautilus-extensions/nautilus-keep-last-vertical-box.c +++ b/libnautilus-extensions/nautilus-keep-last-vertical-box.c @@ -96,7 +96,7 @@ nautilus_keep_last_vertical_box_size_allocate (GtkWidget *widget, g_return_if_fail (NAUTILUS_IS_KEEP_LAST_VERTICAL_BOX (widget)); g_return_if_fail (allocation != NULL); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); box = GTK_BOX (widget); children = g_list_last (box->children); diff --git a/libnautilus-extensions/nautilus-label.c b/libnautilus-extensions/nautilus-label.c index 520eeee3d..8e90c8b9e 100644 --- a/libnautilus-extensions/nautilus-label.c +++ b/libnautilus-extensions/nautilus-label.c @@ -342,7 +342,7 @@ nautilus_label_destroy (GtkObject *object) g_free (label->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -552,7 +552,7 @@ nautilus_label_size_request (GtkWidget *widget, label = NAUTILUS_LABEL (widget); if (!label_is_smooth (label)) { - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition)); return; } @@ -580,7 +580,7 @@ nautilus_label_size_allocate (GtkWidget *widget, label = NAUTILUS_LABEL (widget); /* Pre chain size_allocate */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); if (label->details->adjust_wrap_on_resize) { label->details->smooth_line_wrap_width = (int) allocation->width; @@ -611,7 +611,7 @@ label_paint_pixbuf_callback (GtkWidget *widget, event = (GdkEventExpose *) callback_data; - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, expose_event, (widget, event)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event)); } /* Compositing callback for smooth case */ diff --git a/libnautilus-extensions/nautilus-labeled-image.c b/libnautilus-extensions/nautilus-labeled-image.c index 6aa2dea22..233da6410 100644 --- a/libnautilus-extensions/nautilus-labeled-image.c +++ b/libnautilus-extensions/nautilus-labeled-image.c @@ -222,7 +222,7 @@ nautilus_labeled_image_destroy (GtkObject *object) g_free (labeled_image->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-list-column-title.c b/libnautilus-extensions/nautilus-list-column-title.c index 712a41244..e6414c447 100644 --- a/libnautilus-extensions/nautilus-list-column-title.c +++ b/libnautilus-extensions/nautilus-list-column-title.c @@ -259,7 +259,7 @@ nautilus_list_column_title_finalize (GtkObject *object) g_free (column_title->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, finalize, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object)); } static void diff --git a/libnautilus-extensions/nautilus-list.c b/libnautilus-extensions/nautilus-list.c index 3d13d0f48..427eab774 100644 --- a/libnautilus-extensions/nautilus-list.c +++ b/libnautilus-extensions/nautilus-list.c @@ -636,7 +636,7 @@ nautilus_list_destroy (GtkObject *object) unschedule_keyboard_row_reveal (list); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); unref_gcs (list); @@ -949,7 +949,8 @@ nautilus_list_button_press (GtkWidget *widget, GdkEventButton *event) nautilus_list_flush_typeselect_state (list); if (event->window != clist->clist_window) - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, button_press_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, button_press_event, (widget, event)); on_row = nautilus_clist_get_selection_info (clist, event->x, event->y, &row_index, &column_index); list->details->button_down_time = event->time; @@ -1058,7 +1059,8 @@ nautilus_list_button_release (GtkWidget *widget, GdkEventButton *event) retval = FALSE; if (event->window != clist->clist_window) - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, button_release_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, button_release_event, (widget, event)); on_row = nautilus_clist_get_selection_info (clist, event->x, event->y, &row_index, &column_index); @@ -1521,7 +1523,8 @@ nautilus_list_key_press (GtkWidget *widget, return TRUE; } - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, key_press_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, key_press_event, (widget, event)); } return TRUE; @@ -1692,7 +1695,7 @@ nautilus_list_style_set (GtkWidget *widget, GtkStyle *previous_style) list = NAUTILUS_LIST (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, style_set, (widget, previous_style)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style)); if (GTK_WIDGET_REALIZED (widget)) { make_gcs_and_colors (list); @@ -1713,7 +1716,7 @@ nautilus_list_realize (GtkWidget *widget) clist->column[0].button = list->details->title; - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); make_gcs_and_colors (list); @@ -1741,7 +1744,7 @@ nautilus_list_unrealize (GtkWidget *widget) /* unref all the gcs we've created */ unref_gcs (NAUTILUS_LIST (widget)); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, unrealize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); } /* this is here just temporarily */ @@ -2676,8 +2679,8 @@ draw_rows (NautilusCList *clist, GdkRectangle *area) break; } - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, - draw_row, (clist, area, row_index, list->data)); + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, + draw_row, (clist, area, row_index, list->data)); list = list->next; } @@ -2693,7 +2696,7 @@ draw_all (NautilusCList *clist) area.y = 0; area.width = clist->clist_window_width; area.height = clist->clist_window_height; - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area)); + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area)); } static void @@ -2727,7 +2730,7 @@ nautilus_list_draw (GtkWidget *widget, GdkRectangle *area) (2 * widget->style->klass->ythickness) + clist->column_title_area.height); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, area)); + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, area)); /* Draw the title if it exists */ if (list->details->title) { @@ -2763,8 +2766,8 @@ nautilus_list_expose (GtkWidget *widget, GdkEventExpose *event) (2 * widget->style->klass->ythickness) + clist->column_title_area.height); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, draw_rows, - (clist, &event->area)); + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, + (clist, &event->area)); } return FALSE; @@ -2780,7 +2783,7 @@ nautilus_list_resize_column (NautilusCList *clist, int column_index, int width) gtk_widget_queue_draw (list->details->title); - NAUTILUS_CALL_PARENT_CLASS (NAUTILUS_CLIST_CLASS, resize_column, (clist, column_index, width)); + NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, resize_column, (clist, column_index, width)); } @@ -2856,7 +2859,8 @@ nautilus_list_set_cell_contents (NautilusCList *clist, row->cell[column_index].type = NAUTILUS_CELL_TEXT; } - NAUTILUS_CALL_PARENT_CLASS (NAUTILUS_CLIST_CLASS, set_cell_contents, (clist, row, column_index, type, text, spacing, pixmap, mask)); + NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, set_cell_contents, + (clist, row, column_index, type, text, spacing, pixmap, mask)); if ((NautilusCellType)type == NAUTILUS_CELL_PIXBUF_LIST) { row->cell[column_index].type = NAUTILUS_CELL_PIXBUF_LIST; @@ -2898,14 +2902,14 @@ set_list_cell (NautilusList *list, * expected parameter type, we have to sneak it in by casting it into * one of the expected parameters. */ - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, set_cell_contents, - (clist, row, column_index, type, NULL, 0, (GdkPixmap *) data, NULL)); + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, set_cell_contents, + (clist, row, column_index, type, NULL, 0, (GdkPixmap *) data, NULL)); /* redraw the list if it's not frozen */ if (CLIST_UNFROZEN (clist) - && nautilus_clist_row_is_visible (clist, row_index) != GTK_VISIBILITY_NONE) { - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, draw_row, - (clist, NULL, row_index, row)); + && nautilus_clist_row_is_visible (clist, row_index) != GTK_VISIBILITY_NONE) { + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_row, + (clist, NULL, row_index, row)); } } @@ -3031,7 +3035,7 @@ nautilus_list_track_new_column_width (NautilusCList *clist, int column_index, in area.x = clist->column[column_index].area.x; area.height += clist->clist_window_height; - NAUTILUS_CALL_VIRTUAL (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area)); + NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area)); } } @@ -3094,7 +3098,8 @@ nautilus_list_motion (GtkWidget *widget, GdkEventMotion *event) clist = NAUTILUS_CLIST (widget); if (event->window != clist->clist_window) { - return NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, motion_notify_event, (widget, event)); + return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE + (GTK_WIDGET_CLASS, motion_notify_event, (widget, event)); } if (!((list->details->dnd_press_button == ACTION_BUTTON && (event->state & GDK_BUTTON1_MASK)) @@ -3516,7 +3521,7 @@ nautilus_list_clear (NautilusCList *clist) list = NAUTILUS_LIST (clist); list->details->anchor_row = -1; - NAUTILUS_CALL_PARENT_CLASS (NAUTILUS_CLIST_CLASS, clear, (clist)); + NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, clear, (clist)); } @@ -3703,7 +3708,7 @@ insert_row (NautilusCList *list, int row_index, char *text[]) had_focus = list->focus_row != -1; - result = NAUTILUS_CALL_PARENT_CLASS + result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE (NAUTILUS_CLIST_CLASS, insert_row, (list, row_index, text)); if (!had_focus) { diff --git a/libnautilus-extensions/nautilus-merged-directory.c b/libnautilus-extensions/nautilus-merged-directory.c index 3e2e71349..2f4ef5e70 100644 --- a/libnautilus-extensions/nautilus-merged-directory.c +++ b/libnautilus-extensions/nautilus-merged-directory.c @@ -112,7 +112,7 @@ merged_destroy (GtkObject *object) g_hash_table_destroy (merged->details->monitors); g_free (merged->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static guint diff --git a/libnautilus-extensions/nautilus-metafile-factory.c b/libnautilus-extensions/nautilus-metafile-factory.c index 8fe9223c4..272a6bed9 100644 --- a/libnautilus-extensions/nautilus-metafile-factory.c +++ b/libnautilus-extensions/nautilus-metafile-factory.c @@ -107,7 +107,7 @@ destroy (GtkObject *object) factory = NAUTILUS_METAFILE_FACTORY (object); g_free (factory->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static NautilusMetafileFactory * diff --git a/libnautilus-extensions/nautilus-metafile.c b/libnautilus-extensions/nautilus-metafile.c index dfd0fabd9..7b1f0ed66 100644 --- a/libnautilus-extensions/nautilus-metafile.c +++ b/libnautilus-extensions/nautilus-metafile.c @@ -208,7 +208,7 @@ destroy (GtkObject *object) nautilus_directory_unref (directory); g_free (metafile->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusMetafile * diff --git a/libnautilus-extensions/nautilus-preferences-box.c b/libnautilus-extensions/nautilus-preferences-box.c index 1f211acf2..0bf886a03 100644 --- a/libnautilus-extensions/nautilus-preferences-box.c +++ b/libnautilus-extensions/nautilus-preferences-box.c @@ -132,7 +132,7 @@ nautilus_preferences_box_destroy (GtkObject *object) g_free (preferences_box->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* diff --git a/libnautilus-extensions/nautilus-preferences-pane.c b/libnautilus-extensions/nautilus-preferences-pane.c index 34b561e4a..8d76cef98 100644 --- a/libnautilus-extensions/nautilus-preferences-pane.c +++ b/libnautilus-extensions/nautilus-preferences-pane.c @@ -83,7 +83,7 @@ nautilus_preferences_pane_destroy (GtkObject* object) g_free (preferences_pane->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* diff --git a/libnautilus-extensions/nautilus-scalable-font.c b/libnautilus-extensions/nautilus-scalable-font.c index b20fefbbc..a1371032a 100644 --- a/libnautilus-extensions/nautilus-scalable-font.c +++ b/libnautilus-extensions/nautilus-scalable-font.c @@ -125,7 +125,7 @@ nautilus_scalable_font_destroy (GtkObject *object) g_free (font->detail); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static char * diff --git a/libnautilus-extensions/nautilus-string-picker.c b/libnautilus-extensions/nautilus-string-picker.c index bfd8eb48d..34d1be9f3 100644 --- a/libnautilus-extensions/nautilus-string-picker.c +++ b/libnautilus-extensions/nautilus-string-picker.c @@ -132,7 +132,7 @@ nautilus_string_picker_destroy (GtkObject* object) g_free (string_picker->detail); /* Chain */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* Option menu item callbacks */ diff --git a/libnautilus-extensions/nautilus-tabs.c b/libnautilus-extensions/nautilus-tabs.c index 451569b02..e4846c218 100644 --- a/libnautilus-extensions/nautilus-tabs.c +++ b/libnautilus-extensions/nautilus-tabs.c @@ -233,7 +233,7 @@ nautilus_tabs_destroy (GtkObject *object) NULL); g_free (tabs->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* unload the tab piece images, if any */ diff --git a/libnautilus-extensions/nautilus-text-caption.c b/libnautilus-extensions/nautilus-text-caption.c index caa0f258a..0c1856257 100644 --- a/libnautilus-extensions/nautilus-text-caption.c +++ b/libnautilus-extensions/nautilus-text-caption.c @@ -133,7 +133,7 @@ nautilus_text_caption_initialize (NautilusTextCaption *text_caption) * GtkObjectClass methods */ static void -nautilus_text_caption_destroy(GtkObject* object) +nautilus_text_caption_destroy (GtkObject* object) { NautilusTextCaption * text_caption; @@ -145,7 +145,7 @@ nautilus_text_caption_destroy(GtkObject* object) g_free (text_caption->detail); /* Chain */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* diff --git a/libnautilus-extensions/nautilus-trash-directory.c b/libnautilus-extensions/nautilus-trash-directory.c index 969228b79..8a1bc706e 100644 --- a/libnautilus-extensions/nautilus-trash-directory.c +++ b/libnautilus-extensions/nautilus-trash-directory.c @@ -291,7 +291,7 @@ trash_destroy (GtkObject *object) g_hash_table_destroy (trash->details->volumes); g_free (trash->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static char * diff --git a/libnautilus-extensions/nautilus-trash-file.c b/libnautilus-extensions/nautilus-trash-file.c index 27fd1be89..db067a93c 100644 --- a/libnautilus-extensions/nautilus-trash-file.c +++ b/libnautilus-extensions/nautilus-trash-file.c @@ -669,7 +669,7 @@ trash_destroy (GtkObject *object) nautilus_directory_unref (NAUTILUS_DIRECTORY (trash_directory)); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-undo-context.c b/libnautilus-extensions/nautilus-undo-context.c index 077304fbc..d3f88f51b 100644 --- a/libnautilus-extensions/nautilus-undo-context.c +++ b/libnautilus-extensions/nautilus-undo-context.c @@ -153,7 +153,7 @@ destroy (GtkObject *object) CORBA_exception_free (&ev); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-undo-manager.c b/libnautilus-extensions/nautilus-undo-manager.c index bb319a4fb..c1dd68d25 100644 --- a/libnautilus-extensions/nautilus-undo-manager.c +++ b/libnautilus-extensions/nautilus-undo-manager.c @@ -320,7 +320,7 @@ destroy (GtkObject *object) release_transaction (manager); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } void diff --git a/libnautilus-extensions/nautilus-vfs-directory.c b/libnautilus-extensions/nautilus-vfs-directory.c index bb375bc23..2b29388c4 100644 --- a/libnautilus-extensions/nautilus-vfs-directory.c +++ b/libnautilus-extensions/nautilus-vfs-directory.c @@ -54,7 +54,7 @@ nautilus_vfs_directory_initialize (gpointer object, gpointer klass) static void vfs_destroy (GtkObject *object) { - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static gboolean diff --git a/libnautilus-extensions/nautilus-vfs-file.c b/libnautilus-extensions/nautilus-vfs-file.c index 6f20c754b..4331fb7ed 100644 --- a/libnautilus-extensions/nautilus-vfs-file.c +++ b/libnautilus-extensions/nautilus-vfs-file.c @@ -248,7 +248,7 @@ nautilus_vfs_file_initialize (gpointer object, gpointer klass) static void vfs_destroy (GtkObject *object) { - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-viewport.c b/libnautilus-extensions/nautilus-viewport.c index f96cba596..893d63c30 100644 --- a/libnautilus-extensions/nautilus-viewport.c +++ b/libnautilus-extensions/nautilus-viewport.c @@ -122,7 +122,7 @@ nautilus_viewport_destroy (GtkObject *object) g_free (viewport->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* GtkWidgetClass methods */ @@ -237,7 +237,7 @@ nautilus_viewport_realize (GtkWidget *widget) nautilus_viewport = NAUTILUS_VIEWPORT (widget); /* GtkViewport does the actual realization */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window, nautilus_viewport_get_is_smooth (nautilus_viewport)); diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index c335d6e0c..a35ee15bb 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -247,7 +247,7 @@ nautilus_volume_monitor_destroy (GtkObject *object) global_volume_monitor = NULL; - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/libnautilus-extensions/nautilus-wrap-table.c b/libnautilus-extensions/nautilus-wrap-table.c index f6b39dbd5..260f0feb3 100644 --- a/libnautilus-extensions/nautilus-wrap-table.c +++ b/libnautilus-extensions/nautilus-wrap-table.c @@ -176,7 +176,7 @@ nautilus_wrap_table_destroy (GtkObject *object) * The details will be used in the nautilus_wrap_box_remove () * method as a result of the children being killed. */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); g_list_free (wrap_table->details->children); |