Commit 764d936a authored by Darin Adler's avatar Darin Adler
Browse files

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.
parent b67dd0cb
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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);
......
......@@ -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 */
......
......@@ -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
......
......@@ -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
......
......@@ -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) {
......
......@@ -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
......
......@@ -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 *
......
......@@ -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 *
......
......@@ -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));
}
/*
......
......@@ -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));
}
/*
......
......@@ -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 *
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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));
}
/*
......
......@@ -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 *
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment