diff options
160 files changed, 863 insertions, 492 deletions
@@ -1,3 +1,306 @@ +2001-02-22 Darin Adler <darin@eazel.com> + + reviewed by: John Sullivan <sullivan@eazel.com> + + Fix bug 6859 (GTK signal macros don't work in non-GCC compilers + for void return types). + + * libnautilus-extensions/nautilus-gtk-macros.h: + Replaced old macros that accidentally relied on gccisms with + new ones that are portable to other compilers. + + NAUTILUS_CALL_PARENT_CLASS is replaced by + NAUTILUS_CALL_PARENT + and NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE. + + NAUTILUS_CALL_VIRTUAL is replaced by + NAUTILUS_CALL_METHOD + and NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + + * components/adapter/nautilus-adapter-control-embed-strategy.c: + (nautilus_adapter_control_embed_strategy_destroy): + * components/adapter/nautilus-adapter-embed-strategy.c: + (nautilus_adapter_embed_strategy_destroy), + (nautilus_adapter_embed_strategy_get_widget), + (nautilus_adapter_embed_strategy_get_zoomable): + * components/adapter/nautilus-adapter-embeddable-embed-strategy.c: + (nautilus_adapter_embeddable_embed_strategy_destroy): + * components/adapter/nautilus-adapter-factory-server.c: + (nautilus_adapter_factory_server_destroy): + * components/adapter/nautilus-adapter-file-load-strategy.c: + (nautilus_adapter_file_load_strategy_destroy): + * components/adapter/nautilus-adapter-load-strategy.c: + (nautilus_adapter_load_strategy_destroy), + (nautilus_adapter_load_strategy_load_location), + (nautilus_adapter_load_strategy_stop_loading): + * components/adapter/nautilus-adapter-progressive-load-strategy.c: + (nautilus_adapter_progressive_load_strategy_destroy): + * components/adapter/nautilus-adapter-stream-load-strategy.c: + (nautilus_adapter_stream_load_strategy_destroy): + * components/adapter/nautilus-adapter.c: + (nautilus_adapter_destroy): + * components/hardware/nautilus-hardware-view.c: + (nautilus_hardware_view_destroy): + * components/history/nautilus-history-view.c: + (nautilus_history_view_destroy): + * components/loser/content/nautilus-content-loser.c: + (nautilus_content_loser_destroy): + * components/loser/sidebar/nautilus-sidebar-loser.c: + (nautilus_sidebar_loser_destroy): + * components/music/nautilus-music-view.c: + (nautilus_music_view_destroy): + * components/rpmview/nautilus-rpm-verify-window.c: + (nautilus_rpm_verify_window_destroy): + * components/rpmview/nautilus-rpm-view.c: + (nautilus_rpm_view_destroy): + * components/sample/nautilus-sample-content-view.c: + (nautilus_sample_content_view_destroy): + * components/services/install/nautilus-view/nautilus-service-instal + l-view.c: (nautilus_service_install_view_destroy), + (nautilus_service_install_view_finalize): + * components/services/inventory-view/nautilus-inventory-config-page + .c: (nautilus_inventory_config_page_destroy): + * components/services/inventory-view/nautilus-inventory-view.c: + (nautilus_inventory_view_destroy): + * components/services/login/nautilus-view/nautilus-change-password- + view.c: (nautilus_change_password_view_destroy): + * components/services/nautilus-dependent-shared/eazel-services-foot + er.c: (footer_destroy): + * components/services/nautilus-dependent-shared/eazel-services-head + er.c: (header_destroy): + * components/services/summary/nautilus-summary-view.c: + (nautilus_summary_view_destroy): + * components/services/time/nautilus-view/trilobite-eazel-time-view. + c: (trilobite_eazel_time_view_destroy): + * components/text/nautilus-text-view.c: + (nautilus_text_view_destroy): + * components/throbber/nautilus-throbber.c: + (nautilus_throbber_destroy), (nautilus_throbber_map), + (nautilus_throbber_size_allocate): + * components/tree/nautilus-tree-change-queue.c: + (nautilus_tree_change_queue_destroy): + * components/tree/nautilus-tree-expansion-state.c: + (nautilus_tree_expansion_state_destroy): + * components/tree/nautilus-tree-model.c: + (nautilus_tree_model_destroy): + * components/tree/nautilus-tree-node.c: + (nautilus_tree_node_destroy): + * components/tree/nautilus-tree-view.c: + (nautilus_tree_view_destroy): + * help/nautilus-quick-reference/.cvsignore: + * help/nautilus-quick-reference/C/.cvsignore: + * libnautilus-extensions/nautilus-background-canvas-group.c: + (nautilus_background_canvas_group_update), + (nautilus_background_canvas_group_draw), + (nautilus_background_canvas_group_render): + * libnautilus-extensions/nautilus-background.c: + (nautilus_background_destroy): + * libnautilus-extensions/nautilus-bookmark.c: + (nautilus_bookmark_destroy): + * libnautilus-extensions/nautilus-caption.c: + (nautilus_caption_destroy), (nautilus_font_picker_show_all): + * libnautilus-extensions/nautilus-clickable-image.c: + (nautilus_clickable_image_destroy), + (nautilus_clickable_image_realize), + (nautilus_clickable_image_expose_event): + * libnautilus-extensions/nautilus-debug-drawing.c: + (debug_pixbuf_viewer_destroy): + * libnautilus-extensions/nautilus-directory-metafile-monitor.c: + (destroy): + * libnautilus-extensions/nautilus-directory.c: + (nautilus_directory_destroy), + (nautilus_directory_get_name_for_self_as_new_file), + (nautilus_directory_are_all_files_seen), + (nautilus_directory_contains_file), + (nautilus_directory_call_when_ready), + (nautilus_directory_cancel_callback), + (nautilus_directory_file_monitor_add), + (nautilus_directory_file_monitor_remove), + (nautilus_directory_force_reload), + (nautilus_directory_is_not_empty): + * libnautilus-extensions/nautilus-druid-page-eazel.c: + (nautilus_druid_page_eazel_destroy), + (nautilus_druid_page_eazel_finalize), + (nautilus_druid_page_eazel_size_allocate), + (nautilus_druid_page_eazel_size_request): + * libnautilus-extensions/nautilus-ellipsizing-label.c: + (real_size_request), (real_size_allocate), (real_style_set): + * libnautilus-extensions/nautilus-entry.c: + (nautilus_entry_destroy), (nautilus_entry_key_press), + (nautilus_entry_motion_notify), (nautilus_entry_set_selection), + (nautilus_entry_insert_text), (nautilus_entry_delete_text), + (nautilus_entry_selection_clear): + * libnautilus-extensions/nautilus-file.c: (destroy), + (nautilus_file_monitor_add), (nautilus_file_monitor_remove), + (nautilus_file_get_date), (nautilus_file_get_where_string), + (nautilus_file_get_directory_item_count), + (nautilus_file_get_deep_counts), (nautilus_file_get_file_type), + (nautilus_file_check_if_ready), (nautilus_file_call_when_ready), + (nautilus_file_cancel_call_when_ready): + * libnautilus-extensions/nautilus-font-factory.c: (destroy): + * libnautilus-extensions/nautilus-font-picker.c: + (nautilus_font_picker_destroy): + * libnautilus-extensions/nautilus-horizontal-splitter.c: + (nautilus_horizontal_splitter_destroy), + (nautilus_horizontal_splitter_button_press): + * libnautilus-extensions/nautilus-icon-canvas-item.c: + (nautilus_icon_canvas_item_destroy), + (nautilus_icon_canvas_item_update): + * libnautilus-extensions/nautilus-icon-container.c: (destroy), + (size_allocate), (realize), (unrealize), (button_press_event), + (button_release_event), (motion_notify_event), (key_press_event): + * libnautilus-extensions/nautilus-icon-factory.c: + (nautilus_icon_factory_destroy): + * libnautilus-extensions/nautilus-image-table.c: + (nautilus_image_table_destroy), + (nautilus_image_table_expose_event), + (nautilus_image_table_realize), (nautilus_image_table_unrealize), + (nautilus_image_table_remove): + * libnautilus-extensions/nautilus-image.c: + (nautilus_image_destroy): + * libnautilus-extensions/nautilus-keep-last-vertical-box.c: + (nautilus_keep_last_vertical_box_size_allocate): + * libnautilus-extensions/nautilus-label.c: + (nautilus_label_destroy), (nautilus_label_size_request), + (nautilus_label_size_allocate), (label_paint_pixbuf_callback): + * libnautilus-extensions/nautilus-labeled-image.c: + (nautilus_labeled_image_destroy): + * libnautilus-extensions/nautilus-list-column-title.c: + (nautilus_list_column_title_finalize): + * libnautilus-extensions/nautilus-list.c: (nautilus_list_destroy), + (nautilus_list_button_press), (nautilus_list_button_release), + (nautilus_list_key_press), (nautilus_list_style_set), + (nautilus_list_realize), (nautilus_list_unrealize), (draw_rows), + (draw_all), (nautilus_list_draw), (nautilus_list_expose), + (nautilus_list_resize_column), (nautilus_list_set_cell_contents), + (set_list_cell), (nautilus_list_track_new_column_width), + (nautilus_list_motion), (nautilus_list_clear), (insert_row): + * libnautilus-extensions/nautilus-merged-directory.c: + (merged_destroy): + * libnautilus-extensions/nautilus-metafile-factory.c: (destroy): + * libnautilus-extensions/nautilus-metafile.c: (destroy): + * libnautilus-extensions/nautilus-preferences-box.c: + (nautilus_preferences_box_destroy): + * libnautilus-extensions/nautilus-preferences-pane.c: + (nautilus_preferences_pane_destroy): + * libnautilus-extensions/nautilus-scalable-font.c: + (nautilus_scalable_font_destroy): + * libnautilus-extensions/nautilus-string-picker.c: + (nautilus_string_picker_destroy): + * libnautilus-extensions/nautilus-tabs.c: (nautilus_tabs_destroy): + * libnautilus-extensions/nautilus-text-caption.c: + (nautilus_text_caption_destroy): + * libnautilus-extensions/nautilus-trash-directory.c: + (trash_destroy): + * libnautilus-extensions/nautilus-trash-file.c: (trash_destroy): + * libnautilus-extensions/nautilus-undo-context.c: (destroy): + * libnautilus-extensions/nautilus-undo-manager.c: (destroy): + * libnautilus-extensions/nautilus-vfs-directory.c: (vfs_destroy): + * libnautilus-extensions/nautilus-vfs-file.c: (vfs_destroy): + * libnautilus-extensions/nautilus-viewport.c: + (nautilus_viewport_destroy), (nautilus_viewport_realize): + * libnautilus-extensions/nautilus-volume-monitor.c: + (nautilus_volume_monitor_destroy): + * libnautilus-extensions/nautilus-wrap-table.c: + (nautilus_wrap_table_destroy): + * libnautilus/nautilus-undo-transaction.c: + (nautilus_undo_transaction_destroy): + * libnautilus/nautilus-view.c: (nautilus_view_destroy): + * src/file-manager/fm-desktop-icon-view.c: + (fm_desktop_icon_view_destroy), (real_update_menus), + (real_merge_menus): + * src/file-manager/fm-directory-view.c: + (text_attribute_names_changed_callback), + (image_display_policy_changed_callback), + (directory_view_font_family_changed_callback), + (click_policy_changed_callback), + (smooth_graphics_mode_changed_callback), + (fm_directory_view_destroy), + (fm_directory_view_file_limit_reached), + (fm_directory_view_bump_zoom_level), + (fm_directory_view_zoom_to_level), + (fm_directory_view_restore_default_zoom_level), + (fm_directory_view_can_zoom_in), (fm_directory_view_can_zoom_out), + (fm_directory_view_get_background_widget), + (fm_directory_view_get_selection), (reveal_newly_added_folder), + (fm_directory_view_get_emblem_names_to_exclude), + (fm_directory_view_merge_menus), (fm_directory_view_select_all), + (fm_directory_view_set_selection), + (fm_directory_get_selected_icon_locations), + (fm_directory_view_reveal_selection), + (fm_directory_view_is_read_only), (fm_directory_view_is_empty), + (fm_directory_view_supports_creating_files), + (fm_directory_view_accepts_dragged_files), + (fm_directory_view_supports_properties), + (fm_directory_view_supports_zooming), + (fm_directory_view_update_menus): + * src/file-manager/fm-icon-view.c: (fm_icon_view_destroy), + (fm_icon_view_clean_up), (fm_icon_view_get_directory_sort_by), + (fm_icon_view_set_directory_sort_by), + (fm_icon_view_get_directory_sort_reversed), + (fm_icon_view_set_directory_sort_reversed), + (fm_icon_view_get_directory_auto_layout), + (fm_icon_view_set_directory_auto_layout), + (fm_icon_view_get_directory_tighter_layout), + (fm_icon_view_set_directory_tighter_layout), + (fm_icon_view_supports_auto_layout), + (fm_icon_view_start_renaming_item), (fm_icon_view_merge_menus), + (fm_icon_view_update_menus): + * src/file-manager/fm-list-view.c: (fm_list_view_adding_file), + (fm_list_view_removing_file), (fm_list_view_file_still_belongs), + (get_number_of_columns), (get_link_column), + (get_default_sort_attribute), (get_column_specification): + * src/file-manager/fm-properties-window.c: (real_shutdown), + (real_destroy), (real_finalize): + * src/file-manager/fm-search-list-view.c: (real_destroy), + (real_add_file), (real_adding_file), (real_removing_file), + (real_merge_menus), (real_update_menus): + * src/nautilus-about.c: (nautilus_about_destroy): + * src/nautilus-application.c: (nautilus_application_destroy), + (nautilus_application_startup): + * src/nautilus-complex-search-bar.c: + (nautilus_complex_search_bar_destroy): + * src/nautilus-desktop-window.c: (destroy), (realize): + * src/nautilus-location-bar.c: (destroy): + * src/nautilus-navigation-bar.c: + (nautilus_navigation_bar_get_location), + (nautilus_navigation_bar_set_location): + * src/nautilus-property-browser.c: + (nautilus_property_browser_destroy): + * src/nautilus-search-bar-criterion.c: + (nautilus_search_bar_criterion_destroy): + * src/nautilus-shell.c: (destroy): + * src/nautilus-sidebar-tabs.c: (nautilus_sidebar_tabs_destroy), + (nautilus_sidebar_tabs_size_allocate): + * src/nautilus-sidebar-title.c: (nautilus_sidebar_title_destroy), + (nautilus_sidebar_title_size_allocate): + * src/nautilus-sidebar.c: (nautilus_sidebar_destroy), + (nautilus_sidebar_size_allocate), (nautilus_sidebar_realize): + * src/nautilus-simple-search-bar.c: + (nautilus_simple_search_bar_destroy): + * src/nautilus-switchable-navigation-bar.c: + (nautilus_switchable_navigation_bar_destroy): + * src/nautilus-switchable-search-bar.c: + (nautilus_switchable_search_bar_destroy): + * src/nautilus-theme-selector.c: (nautilus_theme_selector_destroy): + * src/nautilus-view-frame.c: (nautilus_view_frame_destroy), + (nautilus_view_frame_finalize), (nautilus_view_frame_map): + * src/nautilus-window.c: (nautilus_window_destroy), + (nautilus_window_realize), (nautilus_window_size_request), + (nautilus_window_add_current_location_to_history_list), + (nautilus_window_show): + * src/nautilus-zoom-control.c: (nautilus_zoom_control_destroy), + (nautilus_zoom_control_size_allocate): + Use the macros by their new names. + + * RENAMING: Updated for some name changes and name change ideas. + + * user-guide/C/.cvsignore: + * user-guide/C/html/.cvsignore: + * user-guide/C/img/.cvsignore: + * user-guide/C/sgml/.cvsignore: + Added missing cvsignores. + 2001-02-22 J Shane Culpepper <pepper@eazel.com> * components/help/test-help-method.c: (main): @@ -15,7 +15,6 @@ This retains the history in both the old and new locations. ------ macros ------ -NAUTILUS_CALL_VIRTUAL -> NAUTILUS_CALL_METHOD --------------- directory names @@ -43,6 +42,7 @@ header file guard #defines, *NTL* -> *NAUTILUS* classes and other data types ---------------------------- NautilusNavigationInfo -> ? +NautilusList -> NautilusExtendedColumnarList or NautilusExtendedCList -------------- function names diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.c b/components/adapter/nautilus-adapter-control-embed-strategy.c index ceb79f594..a57218d2b 100644 --- a/components/adapter/nautilus-adapter-control-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-embed-strategy.c @@ -106,7 +106,7 @@ nautilus_adapter_control_embed_strategy_destroy (GtkObject *object) g_free (strategy->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c index 2e1b5237b..885c0a3c5 100644 --- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c @@ -111,7 +111,7 @@ nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object) g_free (strategy->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/adapter/nautilus-adapter-embed-strategy.c b/components/adapter/nautilus-adapter-embed-strategy.c index df1b87638..8a3297222 100644 --- a/components/adapter/nautilus-adapter-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embed-strategy.c @@ -108,7 +108,7 @@ nautilus_adapter_embed_strategy_destroy (GtkObject *object) strategy = NAUTILUS_ADAPTER_EMBED_STRATEGY (object); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } @@ -149,15 +149,17 @@ nautilus_adapter_embed_strategy_get (Bonobo_Unknown component) GtkWidget * nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strategy) { - return NAUTILUS_CALL_VIRTUAL (NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy, - get_widget, (strategy)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy, + get_widget, (strategy)); } BonoboObject * nautilus_adapter_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy) { - return NAUTILUS_CALL_VIRTUAL (NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy, - get_zoomable, (strategy)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy, + get_zoomable, (strategy)); } diff --git a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c index 2e1b5237b..885c0a3c5 100644 --- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c @@ -111,7 +111,7 @@ nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object) g_free (strategy->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/adapter/nautilus-adapter-factory-server.c b/components/adapter/nautilus-adapter-factory-server.c index 42da72038..4c5f6119f 100644 --- a/components/adapter/nautilus-adapter-factory-server.c +++ b/components/adapter/nautilus-adapter-factory-server.c @@ -121,7 +121,7 @@ nautilus_adapter_factory_server_initialize (NautilusAdapterFactoryServer *server static void nautilus_adapter_factory_server_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/components/adapter/nautilus-adapter-file-load-strategy.c b/components/adapter/nautilus-adapter-file-load-strategy.c index 9f3c717f6..639d97373 100644 --- a/components/adapter/nautilus-adapter-file-load-strategy.c +++ b/components/adapter/nautilus-adapter-file-load-strategy.c @@ -94,7 +94,7 @@ nautilus_adapter_file_load_strategy_destroy (GtkObject *object) g_free (strategy->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c index 14d5fee0d..90fac934e 100644 --- a/components/adapter/nautilus-adapter-load-strategy.c +++ b/components/adapter/nautilus-adapter-load-strategy.c @@ -120,7 +120,7 @@ nautilus_adapter_load_strategy_destroy (GtkObject *object) strategy = NAUTILUS_ADAPTER_LOAD_STRATEGY (object); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } @@ -178,8 +178,8 @@ nautilus_adapter_load_strategy_load_location (NautilusAdapterLoadStrategy *strat { g_return_if_fail (NAUTILUS_IS_ADAPTER_LOAD_STRATEGY (strategy)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy, - load_location, (strategy, uri)); + NAUTILUS_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy, + load_location, (strategy, uri)); } void @@ -188,8 +188,8 @@ nautilus_adapter_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strat g_return_if_fail (NAUTILUS_IS_ADAPTER_LOAD_STRATEGY (strategy)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy, - stop_loading, (strategy)); + NAUTILUS_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy, + stop_loading, (strategy)); } diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c index ed5884827..2afe5d0b2 100644 --- a/components/adapter/nautilus-adapter-progressive-load-strategy.c +++ b/components/adapter/nautilus-adapter-progressive-load-strategy.c @@ -107,7 +107,7 @@ nautilus_adapter_progressive_load_strategy_destroy (GtkObject *object) g_free (strategy->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusAdapterLoadStrategy * diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.c b/components/adapter/nautilus-adapter-stream-load-strategy.c index 9772a987b..99b6adfb2 100644 --- a/components/adapter/nautilus-adapter-stream-load-strategy.c +++ b/components/adapter/nautilus-adapter-stream-load-strategy.c @@ -93,7 +93,7 @@ nautilus_adapter_stream_load_strategy_destroy (GtkObject *object) g_free (strategy->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 14e1a1ea3..40648640f 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -139,7 +139,7 @@ nautilus_adapter_destroy (GtkObject *object) g_free (adapter->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusAdapter * diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c index d6522db2d..014fd9ed8 100644 --- a/components/hardware/nautilus-hardware-view.c +++ b/components/hardware/nautilus-hardware-view.c @@ -131,7 +131,7 @@ nautilus_hardware_view_destroy (GtkObject *object) g_free (hardware_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* Component embedding support */ diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index 258bc1eab..4a38df0ed 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -287,7 +287,7 @@ nautilus_history_view_destroy (GtkObject *object) gtk_clist_clear (view->list); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } int diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c index 05c40b929..21f0c6c8c 100644 --- a/components/loser/content/nautilus-content-loser.c +++ b/components/loser/content/nautilus-content-loser.c @@ -104,7 +104,7 @@ nautilus_content_loser_destroy (GtkObject *object) g_free (view->details->uri); g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /** diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c index 64787df17..50f30e332 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.c +++ b/components/loser/sidebar/nautilus-sidebar-loser.c @@ -107,7 +107,7 @@ nautilus_sidebar_loser_destroy (GtkObject *object) g_free (view->details->uri); g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /** diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c index 14a4f8dbd..9ae14380f 100644 --- a/components/music/nautilus-music-view.c +++ b/components/music/nautilus-music-view.c @@ -384,7 +384,7 @@ nautilus_music_view_destroy (GtkObject *object) detach_file (music_view); g_free (music_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* utility to return the text describing a song */ diff --git a/components/rpmview/nautilus-rpm-verify-window.c b/components/rpmview/nautilus-rpm-verify-window.c index 341e16e54..9318ff4fd 100644 --- a/components/rpmview/nautilus-rpm-verify-window.c +++ b/components/rpmview/nautilus-rpm-verify-window.c @@ -97,7 +97,7 @@ nautilus_rpm_verify_window_destroy (GtkObject *object) g_free (NAUTILUS_RPM_VERIFY_WINDOW (object)->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* handle the continue button */ diff --git a/components/rpmview/nautilus-rpm-view.c b/components/rpmview/nautilus-rpm-view.c index 2293cb55a..d2bd44312 100644 --- a/components/rpmview/nautilus-rpm-view.c +++ b/components/rpmview/nautilus-rpm-view.c @@ -420,7 +420,7 @@ nautilus_rpm_view_destroy (GtkObject *object) g_free (rpm_view->details->package_name); g_free (rpm_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* Component embedding support */ diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c index 2a24e459e..2b37b6ac7 100644 --- a/components/sample/nautilus-sample-content-view.c +++ b/components/sample/nautilus-sample-content-view.c @@ -166,7 +166,7 @@ nautilus_sample_content_view_destroy (GtkObject *object) /* CHANGE: Pick one. */ #if 0 /* nautilus-specific */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); #else /* non-nautilus-specific */ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); #endif diff --git a/components/services/install-view/nautilus-service-install-view.c b/components/services/install-view/nautilus-service-install-view.c index 5732f046b..cfc5c1ca0 100644 --- a/components/services/install-view/nautilus-service-install-view.c +++ b/components/services/install-view/nautilus-service-install-view.c @@ -104,7 +104,7 @@ nautilus_service_install_view_destroy (GtkObject *object) eazel_install_callback_unref (GTK_OBJECT (view->details->installer)); } - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -124,7 +124,7 @@ nautilus_service_install_view_finalize (GtkObject *object) g_free (view->details->username); g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, finalize, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object)); } static void diff --git a/components/services/install/nautilus-view/nautilus-service-install-view.c b/components/services/install/nautilus-view/nautilus-service-install-view.c index 5732f046b..cfc5c1ca0 100644 --- a/components/services/install/nautilus-view/nautilus-service-install-view.c +++ b/components/services/install/nautilus-view/nautilus-service-install-view.c @@ -104,7 +104,7 @@ nautilus_service_install_view_destroy (GtkObject *object) eazel_install_callback_unref (GTK_OBJECT (view->details->installer)); } - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -124,7 +124,7 @@ nautilus_service_install_view_finalize (GtkObject *object) g_free (view->details->username); g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, finalize, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object)); } static void diff --git a/components/services/inventory-view/nautilus-inventory-config-page.c b/components/services/inventory-view/nautilus-inventory-config-page.c index ef542b0c4..082bcb5d7 100644 --- a/components/services/inventory-view/nautilus-inventory-config-page.c +++ b/components/services/inventory-view/nautilus-inventory-config-page.c @@ -186,7 +186,7 @@ nautilus_inventory_config_page_destroy (GtkObject *object) g_free (page->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/services/inventory-view/nautilus-inventory-view.c b/components/services/inventory-view/nautilus-inventory-view.c index 9ce2fe39d..2862225a2 100644 --- a/components/services/inventory-view/nautilus-inventory-view.c +++ b/components/services/inventory-view/nautilus-inventory-view.c @@ -108,7 +108,7 @@ nautilus_inventory_view_destroy (GtkObject *object) g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/services/login/nautilus-view/nautilus-change-password-view.c b/components/services/login/nautilus-view/nautilus-change-password-view.c index 7da0b8db6..82a48b1bc 100644 --- a/components/services/login/nautilus-view/nautilus-change-password-view.c +++ b/components/services/login/nautilus-view/nautilus-change-password-view.c @@ -556,7 +556,7 @@ nautilus_change_password_view_destroy (GtkObject *object) CORBA_exception_free (&ev); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusView * diff --git a/components/services/nautilus-dependent-shared/eazel-services-footer.c b/components/services/nautilus-dependent-shared/eazel-services-footer.c index 1c4220772..fb754c276 100644 --- a/components/services/nautilus-dependent-shared/eazel-services-footer.c +++ b/components/services/nautilus-dependent-shared/eazel-services-footer.c @@ -123,7 +123,7 @@ footer_destroy (GtkObject *object) g_free (footer->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/components/services/nautilus-dependent-shared/eazel-services-header.c b/components/services/nautilus-dependent-shared/eazel-services-header.c index d8bc5ed20..a58cccd57 100644 --- a/components/services/nautilus-dependent-shared/eazel-services-header.c +++ b/components/services/nautilus-dependent-shared/eazel-services-header.c @@ -79,7 +79,7 @@ header_destroy (GtkObject *object) g_free (header->details); /* Chain destroy */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* EazelServicesHeader public methods */ diff --git a/components/services/summary/nautilus-summary-view.c b/components/services/summary/nautilus-summary-view.c index 01c860a66..79e232da1 100644 --- a/components/services/summary/nautilus-summary-view.c +++ b/components/services/summary/nautilus-summary-view.c @@ -782,7 +782,7 @@ nautilus_summary_view_destroy (GtkObject *object) g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); CORBA_exception_free (&ev); diff --git a/components/services/time/nautilus-view/trilobite-eazel-time-view.c b/components/services/time/nautilus-view/trilobite-eazel-time-view.c index 7427abbdf..8b0bc1ba6 100644 --- a/components/services/time/nautilus-view/trilobite-eazel-time-view.c +++ b/components/services/time/nautilus-view/trilobite-eazel-time-view.c @@ -438,7 +438,7 @@ trilobite_eazel_time_view_destroy (GtkObject *object) g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); CORBA_exception_free (&ev); diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c index 5ae03b396..56453db43 100644 --- a/components/text/nautilus-text-view.c +++ b/components/text/nautilus-text-view.c @@ -254,7 +254,7 @@ nautilus_text_view_destroy (GtkObject *object) g_free (text_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* here's a callback for the async close, which does nothing */ diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c index 985d275db..a5e999704 100644 --- a/components/throbber/nautilus-throbber.c +++ b/components/throbber/nautilus-throbber.c @@ -202,7 +202,7 @@ nautilus_throbber_destroy (GtkObject *object) g_free (throbber->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } BonoboObject* @@ -409,7 +409,7 @@ nautilus_throbber_map (GtkWidget *widget) throbber = NAUTILUS_THROBBER (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, map, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget)); throbber->details->ready = TRUE; } @@ -617,7 +617,7 @@ nautilus_throbber_size_allocate (GtkWidget *widget, GtkAllocation *allocation) int throbber_width, throbber_height; NautilusThrobber *throbber = NAUTILUS_THROBBER (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); get_throbber_dimensions (throbber, &throbber_width, &throbber_height); diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c index 86d956106..ba0e810ec 100644 --- a/components/tree/nautilus-tree-change-queue.c +++ b/components/tree/nautilus-tree-change-queue.c @@ -81,7 +81,7 @@ nautilus_tree_change_queue_destroy (GtkObject *object) NULL); g_free (queue->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c index 789e5534c..065d45bf1 100644 --- a/components/tree/nautilus-tree-expansion-state.c +++ b/components/tree/nautilus-tree-expansion-state.c @@ -160,7 +160,7 @@ nautilus_tree_expansion_state_destroy (GtkObject *object) g_free (expansion_state->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c index 487764f5a..2c4912937 100644 --- a/components/tree/nautilus-tree-model.c +++ b/components/tree/nautilus-tree-model.c @@ -181,7 +181,7 @@ nautilus_tree_model_destroy (GtkObject *object) g_free (model->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c index 32f1b0863..913d45123 100644 --- a/components/tree/nautilus-tree-node.c +++ b/components/tree/nautilus-tree-node.c @@ -80,7 +80,7 @@ nautilus_tree_node_destroy (GtkObject *object) g_free (node->details->uri); g_free (node->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusTreeNode * diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c index 506ec3102..6fe4053dd 100644 --- a/components/tree/nautilus-tree-view.c +++ b/components/tree/nautilus-tree-view.c @@ -1040,7 +1040,7 @@ nautilus_tree_view_destroy (GtkObject *object) g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /** diff --git a/user-guide/C/.cvsignore b/help/nautilus-quick-reference/.cvsignore index 282522db0..282522db0 100644 --- a/user-guide/C/.cvsignore +++ b/help/nautilus-quick-reference/.cvsignore diff --git a/user-guide/C/html/.cvsignore b/help/nautilus-quick-reference/C/.cvsignore index 282522db0..282522db0 100644 --- a/user-guide/C/html/.cvsignore +++ b/help/nautilus-quick-reference/C/.cvsignore 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); diff --git a/libnautilus-private/nautilus-background-canvas-group.c b/libnautilus-private/nautilus-background-canvas-group.c index 52d250f05..09bbd0f6e 100644 --- a/libnautilus-private/nautilus-background-canvas-group.c +++ b/libnautilus-private/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-private/nautilus-background.c b/libnautilus-private/nautilus-background.c index b21153420..4e253fcd1 100644 --- a/libnautilus-private/nautilus-background.c +++ b/libnautilus-private/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-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 2644e165f..ef1b4b921 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/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-private/nautilus-caption.c b/libnautilus-private/nautilus-caption.c index 9b2698343..54f0f7051 100644 --- a/libnautilus-private/nautilus-caption.c +++ b/libnautilus-private/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-private/nautilus-clickable-image.c b/libnautilus-private/nautilus-clickable-image.c index 9cfbced68..b854d0a90 100644 --- a/libnautilus-private/nautilus-clickable-image.c +++ b/libnautilus-private/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-private/nautilus-debug-drawing.c b/libnautilus-private/nautilus-debug-drawing.c index 728f77788..dcdec1548 100644 --- a/libnautilus-private/nautilus-debug-drawing.c +++ b/libnautilus-private/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-private/nautilus-directory-metafile-monitor.c b/libnautilus-private/nautilus-directory-metafile-monitor.c index b7fecd6df..5bae8862e 100644 --- a/libnautilus-private/nautilus-directory-metafile-monitor.c +++ b/libnautilus-private/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-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 82d8d28db..3d46e3d7c 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/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-private/nautilus-druid-page-eazel.c b/libnautilus-private/nautilus-druid-page-eazel.c index 39fadc869..a2c1d8adf 100644 --- a/libnautilus-private/nautilus-druid-page-eazel.c +++ b/libnautilus-private/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-private/nautilus-ellipsizing-label.c b/libnautilus-private/nautilus-ellipsizing-label.c index 28e537178..1903f3774 100644 --- a/libnautilus-private/nautilus-ellipsizing-label.c +++ b/libnautilus-private/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-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index 338af15b2..10af50e5d 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/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-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index af90aa02a..26aac564b 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/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-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c index 4da634c0b..9c1bbb637 100644 --- a/libnautilus-private/nautilus-font-factory.c +++ b/libnautilus-private/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-private/nautilus-font-picker.c b/libnautilus-private/nautilus-font-picker.c index 068102c7e..ffe2639d5 100644 --- a/libnautilus-private/nautilus-font-picker.c +++ b/libnautilus-private/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-private/nautilus-gtk-macros.h b/libnautilus-private/nautilus-gtk-macros.h index 09ac5ea91..a8d12856e 100644 --- a/libnautilus-private/nautilus-gtk-macros.h +++ b/libnautilus-private/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-private/nautilus-horizontal-splitter.c b/libnautilus-private/nautilus-horizontal-splitter.c index fa5ccfd78..676e39a8d 100644 --- a/libnautilus-private/nautilus-horizontal-splitter.c +++ b/libnautilus-private/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-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 2fa3496d8..d5c46a7d4 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/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-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index dcee6e34a..1a4543444 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/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-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 7fc4b8089..07e805ee3 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/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-private/nautilus-image-table.c b/libnautilus-private/nautilus-image-table.c index 0f77036f2..0e1f1f3f8 100644 --- a/libnautilus-private/nautilus-image-table.c +++ b/libnautilus-private/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-private/nautilus-image.c b/libnautilus-private/nautilus-image.c index 36251e4ee..d1922d59d 100644 --- a/libnautilus-private/nautilus-image.c +++ b/libnautilus-private/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-private/nautilus-keep-last-vertical-box.c b/libnautilus-private/nautilus-keep-last-vertical-box.c index 7b0fe4aca..c773fc1c8 100644 --- a/libnautilus-private/nautilus-keep-last-vertical-box.c +++ b/libnautilus-private/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-private/nautilus-label.c b/libnautilus-private/nautilus-label.c index 520eeee3d..8e90c8b9e 100644 --- a/libnautilus-private/nautilus-label.c +++ b/libnautilus-private/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-private/nautilus-labeled-image.c b/libnautilus-private/nautilus-labeled-image.c index 6aa2dea22..233da6410 100644 --- a/libnautilus-private/nautilus-labeled-image.c +++ b/libnautilus-private/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-private/nautilus-list-column-title.c b/libnautilus-private/nautilus-list-column-title.c index 712a41244..e6414c447 100644 --- a/libnautilus-private/nautilus-list-column-title.c +++ b/libnautilus-private/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-private/nautilus-list.c b/libnautilus-private/nautilus-list.c index 3d13d0f48..427eab774 100644 --- a/libnautilus-private/nautilus-list.c +++ b/libnautilus-private/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-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c index 3e2e71349..2f4ef5e70 100644 --- a/libnautilus-private/nautilus-merged-directory.c +++ b/libnautilus-private/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-private/nautilus-metafile-factory.c b/libnautilus-private/nautilus-metafile-factory.c index 8fe9223c4..272a6bed9 100644 --- a/libnautilus-private/nautilus-metafile-factory.c +++ b/libnautilus-private/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-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c index dfd0fabd9..7b1f0ed66 100644 --- a/libnautilus-private/nautilus-metafile.c +++ b/libnautilus-private/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-private/nautilus-preferences-box.c b/libnautilus-private/nautilus-preferences-box.c index 1f211acf2..0bf886a03 100644 --- a/libnautilus-private/nautilus-preferences-box.c +++ b/libnautilus-private/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-private/nautilus-preferences-pane.c b/libnautilus-private/nautilus-preferences-pane.c index 34b561e4a..8d76cef98 100644 --- a/libnautilus-private/nautilus-preferences-pane.c +++ b/libnautilus-private/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-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c index b20fefbbc..a1371032a 100644 --- a/libnautilus-private/nautilus-scalable-font.c +++ b/libnautilus-private/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-private/nautilus-string-picker.c b/libnautilus-private/nautilus-string-picker.c index bfd8eb48d..34d1be9f3 100644 --- a/libnautilus-private/nautilus-string-picker.c +++ b/libnautilus-private/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-private/nautilus-tabs.c b/libnautilus-private/nautilus-tabs.c index 451569b02..e4846c218 100644 --- a/libnautilus-private/nautilus-tabs.c +++ b/libnautilus-private/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-private/nautilus-text-caption.c b/libnautilus-private/nautilus-text-caption.c index caa0f258a..0c1856257 100644 --- a/libnautilus-private/nautilus-text-caption.c +++ b/libnautilus-private/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-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c index 969228b79..8a1bc706e 100644 --- a/libnautilus-private/nautilus-trash-directory.c +++ b/libnautilus-private/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-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c index 27fd1be89..db067a93c 100644 --- a/libnautilus-private/nautilus-trash-file.c +++ b/libnautilus-private/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-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c index 077304fbc..d3f88f51b 100644 --- a/libnautilus-private/nautilus-undo-context.c +++ b/libnautilus-private/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-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c index bb319a4fb..c1dd68d25 100644 --- a/libnautilus-private/nautilus-undo-manager.c +++ b/libnautilus-private/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-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c index bb375bc23..2b29388c4 100644 --- a/libnautilus-private/nautilus-vfs-directory.c +++ b/libnautilus-private/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-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c index 6f20c754b..4331fb7ed 100644 --- a/libnautilus-private/nautilus-vfs-file.c +++ b/libnautilus-private/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-private/nautilus-viewport.c b/libnautilus-private/nautilus-viewport.c index f96cba596..893d63c30 100644 --- a/libnautilus-private/nautilus-viewport.c +++ b/libnautilus-private/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-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index c335d6e0c..a35ee15bb 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/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-private/nautilus-wrap-table.c b/libnautilus-private/nautilus-wrap-table.c index f6b39dbd5..260f0feb3 100644 --- a/libnautilus-private/nautilus-wrap-table.c +++ b/libnautilus-private/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); diff --git a/libnautilus/nautilus-undo-transaction.c b/libnautilus/nautilus-undo-transaction.c index d9fb7229a..676800c61 100644 --- a/libnautilus/nautilus-undo-transaction.c +++ b/libnautilus/nautilus-undo-transaction.c @@ -254,7 +254,7 @@ nautilus_undo_transaction_destroy (GtkObject *object) CORBA_Object_release (transaction->owner, &ev); 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/nautilus-view.c b/libnautilus/nautilus-view.c index 45982387c..7f661a6c9 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -446,7 +446,7 @@ nautilus_view_destroy (GtkObject *object) g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static Nautilus_ViewFrame diff --git a/omf-install/.cvsignore b/omf-install/.cvsignore index d7db2971b..990a5f363 100644 --- a/omf-install/.cvsignore +++ b/omf-install/.cvsignore @@ -1,3 +1,4 @@ Makefile Makefile.in +nautilus-quick-reference-C.omf nautilus-user-manual-C.omf diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 78113149a..f75088e37 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -151,7 +151,7 @@ fm_desktop_icon_view_destroy (GtkObject *object) g_free (icon_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -993,7 +993,7 @@ real_update_menus (FMDirectoryView *view) g_assert (FM_IS_DESKTOP_ICON_VIEW (view)); - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, update_menus, (view)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view)); desktop_view = FM_DESKTOP_ICON_VIEW (view); @@ -1066,7 +1066,7 @@ real_merge_menus (FMDirectoryView *view) BONOBO_UI_VERB_END }; - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view)); desktop_view = FM_DESKTOP_ICON_VIEW (view); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 1ba90b602..00edcf810 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -892,7 +892,7 @@ text_attribute_names_changed_callback (gpointer callback_data) view = FM_DIRECTORY_VIEW (callback_data); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, text_attribute_names_changed, (view)); } @@ -904,7 +904,7 @@ image_display_policy_changed_callback (gpointer callback_data) view = FM_DIRECTORY_VIEW (callback_data); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, image_display_policy_changed, (view)); } @@ -916,7 +916,7 @@ directory_view_font_family_changed_callback (gpointer callback_data) view = FM_DIRECTORY_VIEW (callback_data); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, font_family_changed, (view)); } @@ -928,7 +928,7 @@ click_policy_changed_callback (gpointer callback_data) view = FM_DIRECTORY_VIEW (callback_data); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, click_policy_changed, (view)); } @@ -940,7 +940,7 @@ smooth_graphics_mode_changed_callback (gpointer callback_data) view = FM_DIRECTORY_VIEW (callback_data); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, smooth_graphics_mode_changed, (view)); } @@ -1123,7 +1123,7 @@ fm_directory_view_destroy (GtkObject *object) g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /** @@ -1365,7 +1365,7 @@ fm_directory_view_file_limit_reached (FMDirectoryView *view) { g_assert (FM_IS_DIRECTORY_VIEW (view)); - NAUTILUS_CALL_VIRTUAL (FM_DIRECTORY_VIEW_CLASS, view, + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, file_limit_reached, (view)); } @@ -2101,7 +2101,7 @@ fm_directory_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment) return; } - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, bump_zoom_level, (view, zoom_increment)); } @@ -2121,7 +2121,7 @@ fm_directory_view_zoom_to_level (FMDirectoryView *view, int zoom_level) return; } - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, zoom_to_level, (view, zoom_level)); } @@ -2159,7 +2159,7 @@ fm_directory_view_restore_default_zoom_level (FMDirectoryView *view) return; } - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, restore_default_zoom_level, (view)); } @@ -2182,7 +2182,7 @@ fm_directory_view_can_zoom_in (FMDirectoryView *view) return FALSE; } - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, can_zoom_in, (view)); } @@ -2205,7 +2205,7 @@ fm_directory_view_can_zoom_out (FMDirectoryView *view) return FALSE; } - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, can_zoom_out, (view)); } @@ -2215,7 +2215,7 @@ fm_directory_view_get_background_widget (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, get_background_widget, (view)); } @@ -2243,7 +2243,7 @@ fm_directory_view_get_selection (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, get_selection, (view)); } @@ -2751,7 +2751,7 @@ reveal_newly_added_folder (FMDirectoryView *view, NautilusFile *new_file, char* /* no need to select because start_renaming_item selects * fm_directory_view_select_file (view, new_file); */ - NAUTILUS_CALL_VIRTUAL (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_item, (view, target_uri)); + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_item, (view, target_uri)); fm_directory_view_reveal_selection (view); } } @@ -3943,7 +3943,7 @@ fm_directory_view_get_emblem_names_to_exclude (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, get_emblem_names_to_exclude, (view)); } @@ -3972,7 +3972,7 @@ fm_directory_view_merge_menus (FMDirectoryView *view) */ view->details->menus_merged = TRUE; - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, merge_menus, (view)); } @@ -4032,7 +4032,7 @@ fm_directory_view_select_all (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, select_all, (view)); } @@ -4049,7 +4049,7 @@ fm_directory_view_set_selection (FMDirectoryView *view, GList *selection) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, set_selection, (view, selection)); } @@ -4075,7 +4075,7 @@ fm_directory_get_selected_icon_locations (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, get_selected_icon_locations, (view)); } @@ -4090,7 +4090,7 @@ fm_directory_view_reveal_selection (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, reveal_selection, (view)); } @@ -4120,7 +4120,7 @@ fm_directory_view_is_read_only (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, is_read_only, (view)); } @@ -4130,7 +4130,7 @@ fm_directory_view_is_empty (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, is_empty, (view)); } @@ -4146,7 +4146,7 @@ fm_directory_view_supports_creating_files (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, supports_creating_files, (view)); } @@ -4156,7 +4156,7 @@ fm_directory_view_accepts_dragged_files (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, accepts_dragged_files, (view)); } @@ -4202,7 +4202,7 @@ fm_directory_view_supports_properties (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, supports_properties, (view)); } @@ -4220,7 +4220,7 @@ fm_directory_view_supports_zooming (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, supports_zooming, (view)); } @@ -4244,7 +4244,7 @@ fm_directory_view_update_menus (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - NAUTILUS_CALL_VIRTUAL + NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, update_menus, (view)); diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 637f4c94b..a36355439 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -232,7 +232,7 @@ fm_icon_view_destroy (GtkObject *object) nautilus_file_list_free (icon_view->details->icons_not_positioned); g_free (icon_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static NautilusIconContainer * @@ -343,7 +343,7 @@ unstretch_icons_callback (BonoboUIComponent *component, gpointer callback_data, static void fm_icon_view_clean_up (FMIconView *icon_view) { - NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, clean_up, (icon_view)); + NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, clean_up, (icon_view)); } static void @@ -562,8 +562,9 @@ fm_icon_view_get_directory_sort_by (FMIconView *icon_view, return g_strdup ("name"); } - return NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, - get_directory_sort_by, (icon_view, file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_ICON_VIEW_CLASS, icon_view, + get_directory_sort_by, (icon_view, file)); } static char * @@ -584,7 +585,7 @@ fm_icon_view_set_directory_sort_by (FMIconView *icon_view, return; } - NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, + NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, set_directory_sort_by, (icon_view, file, sort_by)); } @@ -607,8 +608,9 @@ fm_icon_view_get_directory_sort_reversed (FMIconView *icon_view, return FALSE; } - return NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, - get_directory_sort_reversed, (icon_view, file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_ICON_VIEW_CLASS, icon_view, + get_directory_sort_reversed, (icon_view, file)); } static gboolean @@ -628,7 +630,7 @@ fm_icon_view_set_directory_sort_reversed (FMIconView *icon_view, return; } - NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, + NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, set_directory_sort_reversed, (icon_view, file, sort_reversed)); } @@ -653,8 +655,9 @@ fm_icon_view_get_directory_auto_layout (FMIconView *icon_view, return FALSE; } - return NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, - get_directory_auto_layout, (icon_view, file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_ICON_VIEW_CLASS, icon_view, + get_directory_auto_layout, (icon_view, file)); } static gboolean @@ -674,7 +677,7 @@ fm_icon_view_set_directory_auto_layout (FMIconView *icon_view, return; } - NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, + NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, set_directory_auto_layout, (icon_view, file, auto_layout)); } @@ -693,8 +696,9 @@ static gboolean fm_icon_view_get_directory_tighter_layout (FMIconView *icon_view, NautilusFile *file) { - return NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, - get_directory_tighter_layout, (icon_view, file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_ICON_VIEW_CLASS, icon_view, + get_directory_tighter_layout, (icon_view, file)); } static gboolean @@ -710,7 +714,7 @@ fm_icon_view_set_directory_tighter_layout (FMIconView *icon_view, NautilusFile *file, gboolean tighter_layout) { - NAUTILUS_CALL_VIRTUAL (FM_ICON_VIEW_CLASS, icon_view, + NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, set_directory_tighter_layout, (icon_view, file, tighter_layout)); } @@ -729,7 +733,7 @@ fm_icon_view_supports_auto_layout (FMIconView *view) { g_return_val_if_fail (FM_IS_ICON_VIEW (view), FALSE); - return NAUTILUS_CALL_VIRTUAL + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE (FM_ICON_VIEW_CLASS, view, supports_auto_layout, (view)); } @@ -1119,7 +1123,7 @@ static void fm_icon_view_start_renaming_item (FMDirectoryView *view, const char *uri) { /* call parent class to make sure the right icon is selected */ - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri)); /* start renaming */ nautilus_icon_container_start_renaming_selected_item (get_icon_container (FM_ICON_VIEW (view))); @@ -1153,7 +1157,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view) g_assert (FM_IS_ICON_VIEW (view)); - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view)); icon_view = FM_ICON_VIEW (view); @@ -1203,7 +1207,7 @@ fm_icon_view_update_menus (FMDirectoryView *view) return; } - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, update_menus, (view)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view)); selection = fm_directory_view_get_selection (view); selection_count = g_list_length (selection); diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 1058d542a..c7e06a0f4 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -266,7 +266,7 @@ static void fm_list_view_destroy (GtkObject *object) { g_free (FM_LIST_VIEW (object)->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -1355,7 +1355,7 @@ real_adding_file (FMListView *view, NautilusFile *file) static void fm_list_view_adding_file (FMListView *view, NautilusFile *file) { - NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, view, + NAUTILUS_CALL_METHOD (FM_LIST_VIEW_CLASS, view, adding_file, (view, file)); } @@ -1368,15 +1368,16 @@ real_removing_file (FMListView *view, NautilusFile *file) static void fm_list_view_removing_file (FMListView *view, NautilusFile *file) { - NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, view, - removing_file, (view, file)); + NAUTILUS_CALL_METHOD (FM_LIST_VIEW_CLASS, view, + removing_file, (view, file)); } static gboolean fm_list_view_file_still_belongs (FMListView *view, NautilusFile *file) { - return NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, view, - file_still_belongs, (view, file)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_LIST_VIEW_CLASS, view, + file_still_belongs, (view, file)); } static gboolean @@ -1457,7 +1458,7 @@ real_start_renaming_item (FMDirectoryView *view, const char *uri) NautilusFile *file; /* call parent class to make sure the right icon is selected */ - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri)); /* Show properties window since we don't do in-place renaming here */ file = nautilus_file_get (uri); fm_properties_window_present (file, view); @@ -1826,22 +1827,25 @@ fm_list_view_font_family_changed (FMDirectoryView *view) static int get_number_of_columns (FMListView *list_view) { - return NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, list_view, - get_number_of_columns, (list_view)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_LIST_VIEW_CLASS, list_view, + get_number_of_columns, (list_view)); } static int get_link_column (FMListView *list_view) { - return NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, list_view, - get_link_column, (list_view)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_LIST_VIEW_CLASS, list_view, + get_link_column, (list_view)); } static char * get_default_sort_attribute (FMListView *list_view) { - return NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, list_view, - get_default_sort_attribute, (list_view)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (FM_LIST_VIEW_CLASS, list_view, + get_default_sort_attribute, (list_view)); } static void @@ -1851,10 +1855,10 @@ get_column_specification (FMListView *list_view, { guint icon_size; - NAUTILUS_CALL_VIRTUAL (FM_LIST_VIEW_CLASS, list_view, - get_column_specification, - (list_view, column_number, specification)); - + NAUTILUS_CALL_METHOD (FM_LIST_VIEW_CLASS, list_view, + get_column_specification, + (list_view, column_number, specification)); + /* We have a special case for the width of the icons * column. */ diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 5723527a6..b674ed9aa 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -2324,7 +2324,7 @@ real_shutdown (GtkObject *object) gtk_signal_disconnect (GTK_OBJECT (window->details->target_file), window->details->file_changed_handler_id); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, shutdown, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, shutdown, (object)); } static void @@ -2353,7 +2353,7 @@ real_destroy (GtkObject *object) /* Note that file_changed_handler_id is disconnected in shutdown, * and details are freed in finalize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -2367,7 +2367,7 @@ real_finalize (GtkObject *object) g_free (window->details->pending_name); g_free (window->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, finalize, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object)); } /* icon selection callback to set the image of the file object to the selected file */ diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c index 5a671efde..b0c1ff480 100644 --- a/src/file-manager/fm-search-list-view.c +++ b/src/file-manager/fm-search-list-view.c @@ -456,7 +456,7 @@ real_destroy (GtkObject *object) } g_free (search_view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static int @@ -648,7 +648,7 @@ real_add_file (FMDirectoryView *view, NautilusFile *file) /* Tell the normal list-view code to add this file. It will add * and ref it only if it's not already in the list. */ - NAUTILUS_CALL_PARENT_CLASS + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, add_file, (view, real_file)); } @@ -665,7 +665,7 @@ real_adding_file (FMListView *view, NautilusFile *file) g_assert (FM_IS_SEARCH_LIST_VIEW (view)); g_assert (NAUTILUS_IS_FILE (file)); - NAUTILUS_CALL_PARENT_CLASS (FM_LIST_VIEW_CLASS, adding_file, (view, file)); + NAUTILUS_CALL_PARENT (FM_LIST_VIEW_CLASS, adding_file, (view, file)); /* FIXME bugzilla.eazel.com 5059: this implies that positioning, custom icon, icon * stretching, etc, will be based on the real directory the file is in, @@ -699,7 +699,7 @@ real_removing_file (FMListView *view, NautilusFile *file) nautilus_file_monitor_remove (file, view); gtk_signal_disconnect_by_func (GTK_OBJECT (file), fm_directory_view_queue_file_change, view); - NAUTILUS_CALL_PARENT_CLASS (FM_LIST_VIEW_CLASS, removing_file, (view, file)); + NAUTILUS_CALL_PARENT (FM_LIST_VIEW_CLASS, removing_file, (view, file)); } static gboolean @@ -762,7 +762,7 @@ real_merge_menus (FMDirectoryView *view) BONOBO_UI_VERB_END }; - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view)); search_view = FM_SEARCH_LIST_VIEW (view); @@ -811,7 +811,7 @@ real_update_menus (FMDirectoryView *view) { g_assert (FM_IS_SEARCH_LIST_VIEW (view)); - NAUTILUS_CALL_PARENT_CLASS (FM_DIRECTORY_VIEW_CLASS, update_menus, (view)); + NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view)); update_reveal_item (FM_SEARCH_LIST_VIEW (view)); } diff --git a/src/nautilus-about.c b/src/nautilus-about.c index 78636009f..667ee0edf 100644 --- a/src/nautilus-about.c +++ b/src/nautilus-about.c @@ -119,7 +119,7 @@ nautilus_about_destroy (GtkObject *object) g_free (about->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/src/nautilus-application.c b/src/nautilus-application.c index c984cfffe..e94b63f03 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -226,7 +226,7 @@ nautilus_application_destroy (GtkObject *object) bonobo_object_unref (BONOBO_OBJECT (application->undo_manager)); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static gboolean @@ -512,7 +512,7 @@ nautilus_application_startup (NautilusApplication *application, * we could figure out a better lifetime rule. */ if (!(kill_shell || restart_shell)) { - bonobo_object_release_unref (shell, &ev); + bonobo_object_release_unref (shell, NULL); } out: diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c index 94d2ac296..8d87811eb 100644 --- a/src/nautilus-complex-search-bar.c +++ b/src/nautilus-complex-search-bar.c @@ -291,7 +291,7 @@ static void nautilus_complex_search_bar_destroy (GtkObject *object) { g_free (NAUTILUS_COMPLEX_SEARCH_BAR (object)->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static GtkWidget * diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c index b2ba20ecc..98a9e9f29 100644 --- a/src/nautilus-desktop-window.c +++ b/src/nautilus-desktop-window.c @@ -156,7 +156,7 @@ destroy (GtkObject *object) nautilus_gtk_object_list_free (window->details->unref_list); g_free (window->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -171,7 +171,7 @@ realize (GtkWidget *widget) | GDK_KEY_PRESS_MASK | GDK_KEY_PRESS_MASK); /* Do the work of realizing. */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* FIXME bugzilla.eazel.com 1253: * Looking at the gnome_win_hints implementation, diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index d66d7a23d..31cff2237 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -312,7 +312,7 @@ nautilus_sidebar_destroy (GtkObject *object) sidebar); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* utility routines to test if sidebar panel is currently enabled */ @@ -1590,7 +1590,7 @@ nautilus_sidebar_size_allocate (GtkWidget *widget, { NautilusSidebar *sidebar = NAUTILUS_SIDEBAR(widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); /* remember the size if it changed */ @@ -1607,7 +1607,7 @@ nautilus_sidebar_realize (GtkWidget *widget) g_return_if_fail (NAUTILUS_IS_SIDEBAR (widget)); /* Superclass does the actual realize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* Tell X not to erase the window contents when resizing */ gdk_window_set_static_gravities (widget->window, TRUE); diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c index 74662b069..5f14f1419 100644 --- a/src/nautilus-location-bar.c +++ b/src/nautilus-location-bar.c @@ -515,7 +515,7 @@ destroy (GtkObject *object) g_free (bar->details->last_location); g_free (bar->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c index 259d4d5ca..7c78d174f 100644 --- a/src/nautilus-navigation-bar.c +++ b/src/nautilus-navigation-bar.c @@ -117,8 +117,9 @@ nautilus_navigation_bar_get_location (NautilusNavigationBar *bar) { g_return_val_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar), NULL); - return NAUTILUS_CALL_VIRTUAL (NAUTILUS_NAVIGATION_BAR_CLASS, bar, - get_location, (bar)); + return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE + (NAUTILUS_NAVIGATION_BAR_CLASS, bar, + get_location, (bar)); } /** @@ -135,8 +136,8 @@ nautilus_navigation_bar_set_location (NautilusNavigationBar *bar, { g_return_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_NAVIGATION_BAR_CLASS, bar, - set_location, (bar, location)); + NAUTILUS_CALL_METHOD (NAUTILUS_NAVIGATION_BAR_CLASS, bar, + set_location, (bar, location)); } void diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 9deb0f86d..5a303fb33 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -749,7 +749,7 @@ nautilus_window_destroy (GtkObject *object) g_free (window->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); } static void @@ -812,7 +812,7 @@ nautilus_window_realize (GtkWidget *widget) GdkBitmap *mask; /* Create our GdkWindow */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* Set the mini icon */ filename = nautilus_pixmap_file ("nautilus-mini-logo.png"); @@ -846,7 +846,7 @@ nautilus_window_size_request (GtkWidget *widget, g_return_if_fail (NAUTILUS_IS_WINDOW (widget)); g_return_if_fail (requisition != NULL); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition)); /* Limit the requisition to be within 90% of the available screen * real state. @@ -1363,8 +1363,8 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window) { g_assert (NAUTILUS_IS_WINDOW (window)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_WINDOW_CLASS, window, - add_current_location_to_history_list, (window)); + NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window, + add_current_location_to_history_list, (window)); } void @@ -1726,7 +1726,7 @@ nautilus_window_show (GtkWidget *widget) window = NAUTILUS_WINDOW (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, show, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget)); /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index 9deb0f86d..5a303fb33 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -749,7 +749,7 @@ nautilus_window_destroy (GtkObject *object) g_free (window->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); } static void @@ -812,7 +812,7 @@ nautilus_window_realize (GtkWidget *widget) GdkBitmap *mask; /* Create our GdkWindow */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* Set the mini icon */ filename = nautilus_pixmap_file ("nautilus-mini-logo.png"); @@ -846,7 +846,7 @@ nautilus_window_size_request (GtkWidget *widget, g_return_if_fail (NAUTILUS_IS_WINDOW (widget)); g_return_if_fail (requisition != NULL); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition)); /* Limit the requisition to be within 90% of the available screen * real state. @@ -1363,8 +1363,8 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window) { g_assert (NAUTILUS_IS_WINDOW (window)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_WINDOW_CLASS, window, - add_current_location_to_history_list, (window)); + NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window, + add_current_location_to_history_list, (window)); } void @@ -1726,7 +1726,7 @@ nautilus_window_show (GtkWidget *widget) window = NAUTILUS_WINDOW (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, show, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget)); /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 89b015daa..b78314339 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -457,7 +457,7 @@ nautilus_property_browser_destroy (GtkObject *object) if (object == GTK_OBJECT (main_browser)) main_browser = NULL; - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index f1ebc0eab..5dc88daab 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -245,7 +245,7 @@ nautilus_search_bar_criterion_destroy (GtkObject *object) */ g_free (criterion->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c index be57301d6..0a0cfd221 100644 --- a/src/nautilus-shell.c +++ b/src/nautilus-shell.c @@ -159,7 +159,7 @@ destroy (GtkObject *object) shell = NAUTILUS_SHELL (object); g_free (shell->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } NautilusShell * diff --git a/src/nautilus-sidebar-tabs.c b/src/nautilus-sidebar-tabs.c index f8dd4ed87..69b1a9854 100644 --- a/src/nautilus-sidebar-tabs.c +++ b/src/nautilus-sidebar-tabs.c @@ -324,7 +324,7 @@ nautilus_sidebar_tabs_destroy (GtkObject *object) g_free (sidebar_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 */ @@ -467,7 +467,7 @@ nautilus_sidebar_tabs_size_allocate(GtkWidget *widget, GtkAllocation *allocation { NautilusSidebarTabs *sidebar_tabs = NAUTILUS_SIDEBAR_TABS(widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); /* layout tabs to make sure height measurement is valid */ measure_total_height (sidebar_tabs); diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c index 340e527e2..803adce8e 100644 --- a/src/nautilus-sidebar-title.c +++ b/src/nautilus-sidebar-title.c @@ -201,7 +201,7 @@ nautilus_sidebar_title_destroy (GtkObject *object) nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_title_theme_changed, sidebar_title); nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, smooth_graphics_mode_changed_callback, sidebar_title); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* return a new index title object */ @@ -692,7 +692,7 @@ nautilus_sidebar_title_size_allocate (GtkWidget *widget, old_width = widget->allocation.width; - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); if (old_width != widget->allocation.width) { /* Need to update the font if the width changes. */ diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index d66d7a23d..31cff2237 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -312,7 +312,7 @@ nautilus_sidebar_destroy (GtkObject *object) sidebar); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } /* utility routines to test if sidebar panel is currently enabled */ @@ -1590,7 +1590,7 @@ nautilus_sidebar_size_allocate (GtkWidget *widget, { NautilusSidebar *sidebar = NAUTILUS_SIDEBAR(widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); /* remember the size if it changed */ @@ -1607,7 +1607,7 @@ nautilus_sidebar_realize (GtkWidget *widget) g_return_if_fail (NAUTILUS_IS_SIDEBAR (widget)); /* Superclass does the actual realize */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* Tell X not to erase the window contents when resizing */ gdk_window_set_static_gravities (widget->window, TRUE); diff --git a/src/nautilus-simple-search-bar.c b/src/nautilus-simple-search-bar.c index 81423e207..0ee64a313 100644 --- a/src/nautilus-simple-search-bar.c +++ b/src/nautilus-simple-search-bar.c @@ -110,7 +110,7 @@ nautilus_simple_search_bar_destroy (GtkObject *object) g_free (bar->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } GtkWidget * diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 9deb0f86d..5a303fb33 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -749,7 +749,7 @@ nautilus_window_destroy (GtkObject *object) g_free (window->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); } static void @@ -812,7 +812,7 @@ nautilus_window_realize (GtkWidget *widget) GdkBitmap *mask; /* Create our GdkWindow */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* Set the mini icon */ filename = nautilus_pixmap_file ("nautilus-mini-logo.png"); @@ -846,7 +846,7 @@ nautilus_window_size_request (GtkWidget *widget, g_return_if_fail (NAUTILUS_IS_WINDOW (widget)); g_return_if_fail (requisition != NULL); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition)); /* Limit the requisition to be within 90% of the available screen * real state. @@ -1363,8 +1363,8 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window) { g_assert (NAUTILUS_IS_WINDOW (window)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_WINDOW_CLASS, window, - add_current_location_to_history_list, (window)); + NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window, + add_current_location_to_history_list, (window)); } void @@ -1726,7 +1726,7 @@ nautilus_window_show (GtkWidget *widget) window = NAUTILUS_WINDOW (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, show, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget)); /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c index a176f2313..b9549b8d2 100644 --- a/src/nautilus-switchable-navigation-bar.c +++ b/src/nautilus-switchable-navigation-bar.c @@ -110,7 +110,7 @@ static void nautilus_switchable_navigation_bar_destroy (GtkObject *object) { g_free (NAUTILUS_SWITCHABLE_NAVIGATION_BAR (object)->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } GtkWidget * diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c index 0bd839e5f..f37183528 100644 --- a/src/nautilus-switchable-search-bar.c +++ b/src/nautilus-switchable-search-bar.c @@ -107,7 +107,7 @@ nautilus_switchable_search_bar_destroy (GtkObject *object) search_bar_preference_changed_callback, bar); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } GtkWidget * diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c index c5fe7194c..f5a138dc4 100644 --- a/src/nautilus-theme-selector.c +++ b/src/nautilus-theme-selector.c @@ -327,7 +327,7 @@ nautilus_theme_selector_destroy (GtkObject *object) if (object == GTK_OBJECT (main_theme_selector)) main_theme_selector = NULL; - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index 4c1985cc2..7fcad5813 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -360,7 +360,7 @@ nautilus_view_frame_destroy (GtkObject *object) */ view->details->state = VIEW_FRAME_FAILED; - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static void @@ -377,7 +377,7 @@ nautilus_view_frame_finalize (GtkObject *object) g_free (view->details->label); g_free (view->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, finalize, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object)); } static void @@ -1255,7 +1255,7 @@ nautilus_view_frame_map (GtkWidget *view_as_widget) view = NAUTILUS_VIEW_FRAME (view_as_widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, map, (view_as_widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (view_as_widget)); if (view->details->control_frame != NULL) { bonobo_control_frame_control_activate (view->details->control_frame); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 9deb0f86d..5a303fb33 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -749,7 +749,7 @@ nautilus_window_destroy (GtkObject *object) g_free (window->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window))); } static void @@ -812,7 +812,7 @@ nautilus_window_realize (GtkWidget *widget) GdkBitmap *mask; /* Create our GdkWindow */ - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, realize, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); /* Set the mini icon */ filename = nautilus_pixmap_file ("nautilus-mini-logo.png"); @@ -846,7 +846,7 @@ nautilus_window_size_request (GtkWidget *widget, g_return_if_fail (NAUTILUS_IS_WINDOW (widget)); g_return_if_fail (requisition != NULL); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_request, (widget, requisition)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition)); /* Limit the requisition to be within 90% of the available screen * real state. @@ -1363,8 +1363,8 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window) { g_assert (NAUTILUS_IS_WINDOW (window)); - NAUTILUS_CALL_VIRTUAL (NAUTILUS_WINDOW_CLASS, window, - add_current_location_to_history_list, (window)); + NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window, + add_current_location_to_history_list, (window)); } void @@ -1726,7 +1726,7 @@ nautilus_window_show (GtkWidget *widget) window = NAUTILUS_WINDOW (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, show, (widget)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget)); /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c index da4a4b732..cde171b86 100644 --- a/src/nautilus-zoom-control.c +++ b/src/nautilus-zoom-control.c @@ -189,7 +189,7 @@ nautilus_zoom_control_destroy (GtkObject *object) g_free (NAUTILUS_ZOOM_CONTROL (object)->details); - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); + NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } static int @@ -714,11 +714,11 @@ static gboolean nautilus_zoom_control_motion_notify (GtkWidget *widget, GdkEvent /* handle setting the size */ static void -nautilus_zoom_control_size_allocate(GtkWidget *widget, GtkAllocation *allocation) +nautilus_zoom_control_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { NautilusZoomControl *zoom_control = NAUTILUS_ZOOM_CONTROL (widget); - NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); + NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation)); widget->allocation.width = get_zoom_width (zoom_control); widget->allocation.height = allocation->height; diff --git a/user-guide/C/img/.cvsignore b/user-guide/C/img/.cvsignore deleted file mode 100644 index e4e5f6c8b..000000000 --- a/user-guide/C/img/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*~
\ No newline at end of file diff --git a/user-guide/C/sgml/.cvsignore b/user-guide/C/sgml/.cvsignore deleted file mode 100644 index e4e5f6c8b..000000000 --- a/user-guide/C/sgml/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*~
\ No newline at end of file |