1. 23 Feb, 2001 1 commit
    • Darin Adler's avatar
      reviewed by: John Sullivan <sullivan@eazel.com> · 764d936a
      Darin Adler authored
      	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.
      764d936a
  2. 16 Nov, 2000 1 commit
    • Martin Baulig's avatar
      reviewed by: Darin Adler <darin@eazel.com> reviewed by: Maciej Stachowiak · 00c39630
      Martin Baulig authored
      2000-10-22  Martin Baulig  <baulig@suse.de>
      
      	reviewed by: Darin Adler  <darin@eazel.com>
      	reviewed by: Maciej Stachowiak  <mjs@eazel.com>
      
      	Use the new Bonobo::Zoomable interface instead of Nautilus::Zoomable.
      
      	* libnautilus/nautilus-zoomable.[ch]: Removed.
      	* src/nautilus-zoomable-frame-corba.c: Removed.
      
      	* libnautilus/nautilus-view-component.idl
      	(ZoomLevels, ZoomLevelList, Zoomable, ZoomableFrame): Removed.
      
      	* src/nautilus-view-frame-private.h
      	(impl_Nautilus_ZoomableFrame_vepv, impl_Nautilus_ZoomableFrame__create):
      	Removed external declarations.
      
      	* src/nautilus-view-frame.h: include <bonobo/bonobo-zoomable-frame.h>.
      	(NautilusViewFrame): Removed the `zoomable' field and changed the
      	type of the `zoomable_frame' field from BonoboObject into
      	BonoboZoomableFrame.
      	(NautilusViewFrameClass): Added `zoom_parameters_changed' signal.
      
      	* src/nautilus-view-frame.c (nautilus_view_frame_destroy_client):
      	Don't release `view->zoomable' and set `view->history_frame' and
      	`view->zoomable_frame' to NULL, not to CORBA_OBJECT_NIL.
      	(nautilus_view_frame_initialize_class): Added ZOOM_PARAMETERS_CHANGED
      	signal.
      	(zoom_level_changed_callback): New static callback function; this emits
      	the ZOOM_LEVEL_CHANGED signal on the NautilusViewFrame.
      	(zoom_parameters_changed_callback): New static callback function; this
      	emits the ZOOM_PARAMETERS_CHANGED signal on the NautilusViewFrame.
      	(nautilus_view_frame_set_to_component): QI the adapted component for
      	"IDL:Bonobo/Zoomable:1.0" and - if it was found - create the
      	BonoboZoomableFrame, bind it to the BonoboZoomable and connect the
      	"zoom_level_changed" and the "zoom_parameters_changed" signals.
      	(nautilus_view_frame_is_zoomable): Return `view->zoomable_frame != NULL'.
      	(nautilus_view_frame_get_zoom_level): Check whether view->zoomable_frame
      	is not NULL and call bonobo_zoomable_frame_get_zoom_level().
      	(nautilus_view_frame_set_zoom_level): Check whether view->zoomable_frame
      	is not NULL and call bonobo_zoomable_frame_set_zoom_level().
      	(nautilus_view_frame_get_min_zoom_level): Check whether
      	view->zoomable_frame is not NULL and call
      	bonobo_zoomable_frame_get_min_zoom_level().
      	(nautilus_view_frame_get_max_zoom_level): Check whether
      	view->zoomable_frame is not NULL and call
      	bonobo_zoomable_frame_get_max_zoom_level().
      	(nautilus_view_frame_get_has_min_zoom_level): New function.
      	Check whether view->zoomable_frame is not NULL and call
      	bonobo_zoomable_frame_has_min_zoom_level().
      	(nautilus_view_frame_get_has_max_zoom_level): New function.
      	Check whether view->zoomable_frame is not NULL and call
      	bonobo_zoomable_frame_has_max_zoom_level().
      	(nautilus_view_frame_get_is_continuous): New function.
      	Check whether view->zoomable_frame is not NULL and call
      	bonobo_zoomable_frame_is_continuous().
      	(nautilus_view_frame_get_preferred_zoom_levels): If
      	view->zoomable_frame is NULL, return NULL. Otherwise
      	bonobo_zoomable_frame_get_preferred_zoom_levels() returns GList *
      	of floats which we can just return.
      	(nautilus_view_frame_zoom_in): If view->zoomable_frame is not NULL,
      	call bonobo_zoomable_frame_zoom_in().
      	(nautilus_view_frame_zoom_out): If view->zoomable_frame is not NULL,
      	call bonobo_zoomable_frame_zoom_out().
      	(nautilus_view_frame_zoom_to_fit):  If view->zoomable_frame is not
      	NULL, call bonobo_zoomable_frame_zoom_out().
      	(nautilus_view_frame_zoom_level_changed): Removed.
      
      	* src/nautilus-zoom-control.c (NautilusZoomControlDetails): Added
      	`has_min_zoom_level' and `has_max_zoom_level'.
      	(draw_zoom_control_image): Call nautilus_zoom_control_can_zoom_in/out()
      	to find out whether we can zoom.
      	(zoom_menu_callback): Likewise.
      	(nautilus_zoom_control_button_press_event): Likewise.
      	(create_zoom_menu_item): Changed the type of the `zoom_level' argument
      	from double to float.
      	(nautilus_zoom_control_set_min_zoom_level): Removed.
      	(nautilus_zoom_control_set_max_zoom_level): Removed.
      	(nautilus_zoom_control_set_preferred_zoom_levels): Removed.
      	(nautilus_zoom_control_set_parameters): New function.
      	(nautilus_zoom_control_has_min_zoom_level): New function.
      	(nautilus_zoom_control_has_max_zoom_level): New function.
      	(nautilus_zoom_control_can_zoom_in): New function.
      	(nautilus_zoom_control_can_zoom_out): New function.
      
      	* src/file-manager/fm-directory-view.c: #include
      	<bonobo/bonobo-zoomable.h> instead of
      	<libnautilus/libnautilus-zoomable.h>.
      	(FMDirectoryViewDetails): Changed the type of `zoomable' to
      	BonoboZoomable.
      	(fm_directory_view_preferred_zoom_levels): Made this an array of float,
      	not double.
      	(fm_directory_view_initialize): Create a new BonoboZoomable object here.
      	(zoomable_zoom_in_callback): The first argument is now a BonoboZoomable.
      	(zoomable_zoom_out_callback): The first argument is now a BonoboZoomable.
      	(nautilus_zoom_level_from_double): Renamed into
      	nautilus_zoom_level_from_float().
      	(zoomable_set_zoom_level_callback): The first argument is now a
      	BonoboZoomable and the second one a float.
      	(zoomable_zoom_to_fit_callback): The first argument is now a
      	BonoboZoomable.
      	(fm_directory_view_set_zoom_level): Call
      	bonobo_zoomable_report_zoom_level_changed()
      	instead of using nautilus_zoomable_set_zoom_level().
      
      	* src/nautilus-window-manage-views.c:
      	(zoom_level_changed_callback): Don't call
      	nautilus_zoom_control_set_min_zoom_level(),
      	nautilus_zoom_control_set_max_zoom_level() and
      	nautilus_zoom_control_set_preferred_zoom_levels() here.
      	Use nautilus_zoom_control_can_zoom_in/out() to find out whether we
      	can zoom in the calls to nautilus_bonobo_set_sensitive().
      	, (zoom_parameters_changed_callback): New callback function.
      	Call nautilus_zoom_control_set_parameters() and - if the zoom_level
      	is not 0.0 - zoom_level_changed_callback().
      
      	* components/adapter/nautilus-zoomable-proxy.[ch]: New files.
      
      	* components/adapter/Makefile.am (nautilus_adapter_SOURCES):
      	Added nautilus-zoomable-proxy.c and nautilus-zoomable-proxy.h.
      
      	* components/adapter/nautilus-adapter-embed-strategy.c
      	(NautilusAdapterEmbedStrategyClass): Added new virtual signal
      	`get_zoomable' which must be overridden.
      	(nautilus_adapter_embed_strategy_initialize_class): Assign it here.
      	(nautilus_adapter_embed_strategy_get_zoomable): New static function;
      	call the virtual `get_zoomable' in the derived class.
      
      	* components/adapter/nautilus-adapter-control-embed-strategy.c:
      	(nautilus_adapter_control_embed_strategy_initialize_class):
      	Assign nautilus_adapter_control_embed_strategy_get_zoomable() as
      	handler of the `get_zoomable' signal.
      	(nautilus_adapter_control_embed_strategy_new): QI the Control for
      	"IDL:Bonobo/Zoomable:1.0" and pass it to nautilus_zoomable_proxy_get()
      	if found and store the return value in strategy->details->zoomable.
      	(nautilus_adapter_control_embed_strategy_get_zoomable): New static
      	function; return strategy->details->zoomable which is set in
      	nautilus_adapter_control_embed_strategy_new().
      
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
      	(nautilus_adapter_embeddable_embed_strategy_initialize_class):
      	Assign nautilus_adapter_embeddable_embed_strategy_get_zoomable() as
      	handler of the `get_zoomable' signal.
      	(nautilus_adapter_embeddable_embed_strategy_new): QI the View for
      	"IDL:Bonobo/Zoomable:1.0" and pass it to nautilus_zoomable_proxy_get()
      	if found and store the return value in strategy->details->zoomable.
      	(nautilus_adapter_embeddable_embed_strategy_get_zoomable): New static
      	function; return strategy->details->zoomable which is set in
      	nautilus_adapter_embeddable_embed_strategy_new().
      
      	* components/adapter/nautilus-adapter.c: (nautilus_adapter_new):
      	Call nautilus_adapter_embed_strategy_get_zoomable(embed_strategy) and
      	bonobo_add_interface() it to the control if found.
      
      	* components/image-viewer/nautilus-image-view.c: Rewrote the Nautilus
      	image viewer to be a BonoboControl, to add zoomable support to it and
      	to merge back everything from bonobo-image-generic into it.
      00c39630
  3. 04 Nov, 2000 1 commit
    • Darin Adler's avatar
      Tell everyone that we are back on bonobo HEAD. Make sure Nautilus doesn't · a96c73cb
      Darin Adler authored
      	* README: Tell everyone that we are back on bonobo HEAD.
      	* configure.in: Make sure Nautilus doesn't try to compile with the
      	old bonobo.
      
      	* components/adapter/nautilus-adapter-embed-strategy.c:
      	(nautilus_adapter_embed_strategy_get):
      	* components/adapter/nautilus-adapter-load-strategy.c:
      	(nautilus_adapter_load_strategy_get):
      	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
      	(nautilus_adapter_progressive_load_strategy_load_location):
      	* components/history/nautilus-history-view.c:
      	(history_view_frame_call_begin):
      	* libnautilus/nautilus-undo.c: (set_up_bonobo_control):
      	* libnautilus/nautilus-view.c: (view_frame_call_begin):
      	* libnautilus/nautilus-zoomable.c:
      	(nautilus_zoomable_ensure_zoomable_frame):
      	Fix all the callers of query_interface in CORBA to call it
      	queryInterface (I used the Bonobo script to do it).
      
      	* src/nautilus-window.h:
      	* src/nautilus-window.c: (nautilus_window_constructed),
      	(nautilus_window_set_arg), (nautilus_window_get_arg),
      	(nautilus_window_set_content_view_widget): Update for BonoboWin ->
      	BonoboWindow change. Once again, the change was done by the Bonobo
      	script (but I had to undo the spaces it ate after BONOBO_WIN).
      
      	* components/services/install/idl/trilobite-eazel-install.idl:
      	* components/services/time/idl/trilobite-eazel-time-service.idl:
      	* components/services/trilobite/idl/trilobite-service.idl:
      	* components/services/trilobite/sample/idl/sample-service.idl:
      	* libnautilus-adapter/nautilus-adapter-factory.idl:
      	* libnautilus/nautilus-distributed-undo.idl:
      	* libnautilus/nautilus-view-component.idl:
      	Since IDL dependencies don't work, I touched every IDL file to
      	make the switchover smoother. This only works if people update
      	before they try to build and fail, otherwise they need to do:
      		find -name '*.xml' | xargs touch
      	(Maciej and I want to add dependency support to orbit-idl to make
      	this problem go away long term).
      
      	* src/nautilus-desktop-window.c: (realize):
      	The script updated this comment to, so I let it.
      
      	* user-guide/C/Makefile.am: Took out the botched change I made to
      	this file. Mathieu did the correct one.
      a96c73cb
  4. 23 Oct, 2000 1 commit
    • Maciej Stachowiak's avatar
      This is Maciej checking in Martin's fix for 3691. Credit to him, · b1d1b652
      Maciej Stachowiak authored
      	blame to me.
      
      	* components/adapter/nautilus-adapter-embed-strategy.h
      	(NautilusAdapterEmbedStrategyClass): Added "activate" and "deactivate"
      	signals.
      	(nautilus_adapter_embed_strategy_get): Removed ui_container argument.
      	(nautilus_adapter_embed_strategy_activate): New function; emits
      	the "activate" signal.
      	(nautilus_adapter_embed_strategy_deactivate): New function; emits
      	the "deactivate" signal.
      
      	* components/adapter/nautilus-adapter-control-embed-strategy.c
      	(nautilus_adapter_control_embed_strategy_activate): New static function;
      	this is the handler of the "activate" signal.
      	(nautilus_adapter_control_embed_strategy_deactivate): New static function;
      	this is the handler of the "deactivate" signal.
      
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c
      	(nautilus_adapter_embeddable_embed_strategy_activate): New static function;
      	this is the handler of the "activate" signal.
      	(nautilus_adapter_embeddable_embed_strategy_deactivate): New static function;
      	this is the handler of the "deactivate" signal.
      
      	* components/adapter/nautilus-adapter.c (nautilus_adapter_activate_callback):
      	New static function; connect this to the "activate" signal of the adapter
      	control.
      b1d1b652
  5. 05 Oct, 2000 1 commit
    • Darin Adler's avatar
      Cut over to HEAD of Bonobo. This check-in includes all the changes · 2ae47c75
      Darin Adler authored
      	needed to compile and run, but there are many things wrong
      	visually that may take a while to get fixed.
      
      	* src/nautilus-window-menus.c: (file_menu_new_window_callback),
      	(file_menu_close_window_callback),
      	(file_menu_close_all_windows_callback),
      	(file_menu_toggle_find_mode_callback),
      	(file_menu_web_search_callback), (edit_menu_undo_callback),
      	(edit_menu_cut_callback), (edit_menu_copy_callback),
      	(edit_menu_paste_callback), (edit_menu_clear_callback),
      	(go_menu_back_callback), (go_menu_forward_callback),
      	(go_menu_up_callback), (go_menu_home_callback),
      	(go_menu_forget_history_callback), (view_menu_reload_callback),
      	(view_menu_show_hide_sidebar_callback),
      	(view_menu_show_hide_tool_bar_callback),
      	(view_menu_show_hide_location_bar_callback),
      	(view_menu_show_hide_status_bar_callback),
      	(nautilus_window_update_show_hide_menu_items),
      	(view_menu_zoom_in_callback), (view_menu_zoom_out_callback),
      	(view_menu_zoom_normal_callback),
      	(bookmarks_menu_add_bookmark_callback),
      	(bookmarks_menu_edit_bookmarks_callback),
      	(user_level_customize_callback), (customize_callback),
      	(change_appearance_callback), (help_menu_about_nautilus_callback),
      	(help_menu_nautilus_feedback_callback), (switch_to_user_level),
      	(user_level_menu_item_callback), (append_placeholder),
      	(append_separator), (append_bookmark_to_menu),
      	(create_menu_item_from_node), (remove_bookmarks_after),
      	(remove_underline_accelerator_from_menu_title),
      	(new_top_level_menu), (add_user_level_menu_item),
      	(nautilus_window_initialize_menus),
      	(nautilus_window_update_find_menu_item),
      	(update_user_level_menu_items), (convert_verb_to_user_level),
      	(convert_user_level_to_verb), (update_preferences_dialog_title):
      	* src/nautilus-window.c: (nautilus_window_clear_status),
      	(nautilus_window_set_status), (install_status_bar),
      	(nautilus_window_constructed), (nautilus_window_set_arg),
      	(nautilus_window_get_arg), (nautilus_window_destroy),
      	(nautilus_window_allow_back), (nautilus_window_allow_forward),
      	(nautilus_window_allow_up), (nautilus_window_allow_reload),
      	(nautilus_window_zoom_level_changed_callback),
      	(nautilus_window_set_content_view_widget), (show_dock_item),
      	(hide_dock_item), (dock_item_showing),
      	(nautilus_window_hide_tool_bar), (nautilus_window_show_tool_bar),
      	(nautilus_window_tool_bar_showing),
      	(nautilus_window_hide_status_bar),
      	(nautilus_window_show_status_bar),
      	(nautilus_window_status_bar_showing):
      	Convert to new API. Some is disabled with #ifdef UIH.
      
      	* Makefile.am:
      	* configure.in:
      	Turned off build of the idl directory, build components after src.
      
      	* components/adapter/main.c:
      	* components/notes/nautilus-notes.c:
      	* components/sample/main.c:
      	* libnautilus-extensions/nautilus-font-picker.c:
      	* libnautilus-extensions/nautilus-global-preferences.c:
      	* libnautilus-extensions/nautilus-password-dialog.c:
      	* libnautilus-extensions/nautilus-preferences-item.c:
      	* libnautilus/nautilus-undo-transaction.c:
      	* libnautilus/nautilus-undo.c:
      	* src/nautilus-application.c:
      	* src/nautilus-history-frame.c:
      	* src/nautilus-link-set-window.c:
      	* src/nautilus-main.c:
      	* src/nautilus-shell.c:
      	* src/nautilus-sidebar.c:
      	* src/nautilus-view-frame-corba.c:
      	* src/nautilus-zoomable-frame-corba.c:
      	* test/test-nautilus-font-picker.c:
      	* test/test-nautilus-image.c: (create_font_picker_frame):
      	* test/test-nautilus-label.c: (create_font_picker_frame):
      	* test/test-nautilus-preferences.c:
      	* test/test-nautilus-widgets.c: (radio_group_load_it_up):
      	Fixed includes.
      
      	* test/test-nautilus-image.c: (create_font_picker_frame):
      	* test/test-nautilus-label.c: (create_font_picker_frame):
      	* test/test-nautilus-widgets.c: (radio_group_load_it_up):
      	Turned off localization of some strings in tests.
      
      	* components/adapter/nautilus-adapter-control-embed-strategy.c:
      	(nautilus_adapter_control_embed_strategy_new):
      	* components/adapter/nautilus-adapter-control-embed-strategy.h:
      	* components/adapter/nautilus-adapter-embed-strategy.c:
      	(nautilus_adapter_embed_strategy_get):
      	* components/adapter/nautilus-adapter-embed-strategy.h:
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
      	(nautilus_adapter_embeddable_embed_strategy_new):
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.h:
      	Embedding code now deals with Bonobo_UIContainer, not
      	Bonobo_UIHandler.
      
      	* components/adapter/nautilus-adapter.c: (nautilus_adapter_new):
      	This code not only had to be changed to deal with the
      	Bonobo_UIContainer instead of Bonobo_UIHandler, but it also needed
      	to deal with the containing item (was remote_ui_handler), not the
      	local component.
      
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
      	(nautilus_adapter_embeddable_embed_strategy_new):
      	* components/adapter/nautilus-adapter.c:
      	BonoboContainer was renamed BonoboItemContainer.
      
      	* components/history/nautilus-history-view.c:
      	Remove unused BonoboUIHandler * field.
      
      	* components/loser/content/Makefile.am:
      	* components/loser/sidebar/Makefile.am:
      	* components/mozilla/Makefile.am:
      	* components/sample/Makefile.am:
      	* src/Makefile.am:
      	* src/file-manager/Makefile.am:
      	Added the necessary defines and build rules to install ui.xml
      	files and locate them from the C code.
      
      	* src/file-manager/nautilus-directory-view-ui.xml:
      	* src/file-manager/nautilus-icon-view-ui.xml:
      	* src/file-manager/nautilus-search-list-view-ui.xml:
      	* src/nautilus-shell-ui.xml:
      	Added definitions of user interface.
      
      	* components/loser/content/nautilus-content-loser-ui.xml:
      	* components/loser/sidebar/nautilus-sidebar-loser-ui.xml:
      	* components/mozilla/nautilus-mozilla-ui.xml:
      	* components/sample/nautilus-sample-content-view-ui.xml:
      	Added empty placeholders for user interface.
      
      	* components/loser/content/nautilus-content-loser.c:
      	(loser_merge_bonobo_items_callback):
      	* components/loser/sidebar/nautilus-sidebar-loser.c:
      	(loser_merge_bonobo_items_callback):
      	* components/mozilla/nautilus-mozilla-content-view.c:
      	(mozilla_merge_bonobo_items_callback):
      	* components/sample/nautilus-sample-content-view.c:
      	(sample_merge_bonobo_items_callback):
      	Use nautilus_view_set_up_ui to get the user interface from a
      	ui.xml file. Put #ifdef UIH around old code to make the items work
      	that still needs to be visited.
      
      	* libnautilus-extensions/nautilus-bonobo-extensions.c:
      	* libnautilus-extensions/nautilus-bonobo-extensions.h:
      	* libnautilus-extensions/nautilus-undo-manager.c:
      	* libnautilus-extensions/nautilus-undo-manager.h:
      	* libnautilus/nautilus-clipboard.c: (add_menu_items_callback),
      	(remove_menu_items_callback),
      	(nautilus_clipboard_set_up_editable_from_bonobo_control):
      	* libnautilus/nautilus-clipboard.h:
      	Wrapped code in ifdef UIH to disable it until it can be converted
      	to the new Bonobo.
      
      	* libnautilus-extensions/nautilus-caption-table.h:
      	* libnautilus-extensions/nautilus-caption.h:
      	* libnautilus-extensions/nautilus-font-picker.h:
      	* libnautilus-extensions/nautilus-preferences-group.h:
      	* libnautilus-extensions/nautilus-preferences-item.h:
      	* libnautilus-extensions/nautilus-radio-button-group.h:
      	* src/nautilus-about.h:
      	Got rid of any cases where headers include the omnibus header
      	<gnome.h>. These made the conversion process harder, which is why
      	we fixed them.
      
      	* libnautilus/libnautilus.h:
      	Got rid of cases where headers include the omnibus header
      	<bonobo.h>.
      
      	* libnautilus/nautilus-view.h:
      	* libnautilus/nautilus-view.c: (nautilus_view_set_up_ui):
      	Added a helper function to make it easy for Nautilus components to
      	load their UI and get it attached to the Nautilus:View object.
      
      	* nautilus.spec.in: Install the nautilus-*-ui.xml files too.
      
      	* src/file-manager/fm-directory-view.h:
      	* src/file-manager/fm-directory-view.c:
      	(bonobo_menu_select_all_callback),
      	(bonobo_menu_empty_trash_callback),
      	(bonobo_control_activate_callback): Convert to new API.
      	(fm_directory_view_get_bonobo_ui_container): Name and purpose
      	changed slightly for new API.
      	(fm_directory_view_real_merge_menus): Merge with new API.
      	(fm_directory_view_real_update_menus): Disabled this code for now.
      
      	* src/file-manager/fm-icon-view.c: (fm_icon_view_destroy): Destroy
      	icon view's own component at destroy time.
      	(context_menu_layout_radio_item_callback),
      	(append_one_context_menu_layout_item),
      	(fm_icon_view_create_background_context_menu_items),
      	(update_layout_menus): Convert to new API, disable some with
      	#ifdef UIH.
      	(get_sort_criterion_by_verb),
      	(set_sort_criterion_by_verb), (sort_callback): Convert to new API.
      	(fm_icon_view_merge_menus): Merge with new API, creating our own
      	UI component separate from the directory view's.
      	(fm_icon_view_update_menus): Disable with #ifdef UIH.
      
      	* src/file-manager/fm-search-list-view.h:
      	* src/file-manager/fm-search-list-view.c:
      	(fm_search_list_view_initialize_class),
      	(fm_search_list_view_initialize), (real_destroy),
      	(indexing_info_callback), (real_merge_menus), (real_update_menus):
      	Add code necessary to use a separate UI component, and disabled
      	the actual menu set-up code with #ifdef UIH. This required adding
      	a details struct.
      
      	* src/nautilus-desktop-window.c: (realize): Turned off the code
      	that hides the desktop elements.
      
      	* src/nautilus-window-private.h:
      	* src/nautilus-view-frame.h:
      	* src/nautilus-view-frame.c: (nautilus_view_frame_destroy),
      	(nautilus_view_frame_new), (nautilus_view_frame_load_client):
      	* src/nautilus-window-manage-views.c: (load_content_view),
      	(nautilus_window_set_sidebar_panels):
      	Change to use Bonobo_UIContainer instead of Bonobo_UIHandler.
      
      	* src/nautilus-window-toolbars.c: (remember_buttons),
      	(nautilus_window_initialize_toolbars): Leave this code around and
      	change it enough to compile and run, even though it's creating a
      	second, invisible toolbar.
      
      	* src/nautilus-window.h: Change to be a BonoboWin subclass instead
      	of a GnomeApp subclass.
      2ae47c75
  6. 20 Sep, 2000 1 commit
    • Maciej Stachowiak's avatar
      Finally fixed bug 1994; in the process I think I also ended up · c70683fe
      Maciej Stachowiak authored
      	fixing 2576, 2577, 2578, 2579 and 2580.
      
      	* components/adapter/nautilus-adapter-embed-strategy.h,
      	components/adapter/nautilus-adapter-embed-strategy.c: Abstract
      	interface for embedding various kinds of Bonobo components.
      	* components/adapter/nautilus-adapter-embed-strategy-private.h:
      	Header inclusing a `protected' call to emit a signal.
      	* components/adapter/nautilus-adapter-control-embed-strategy.h,
      	components/adapter/nautilus-adapter-control-embed-strategy.c:
      	Concrete subclass for embedding a Control.
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.h,
      	components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
      	Concrete subclass for embedding an Embeddable.
      	* components/adapter/Makefile.am: Add new files.
      
      	* components/adapter/nautilus-adapter-progressive-load-strategy.c
      	(nautilus_adapter_progressive_load_strategy_load_location): Fixed
      	incorrect GnomeVFSFIleInfo handling and removed a printf.
      
      	* components/adapter/nautilus-adapter-stream-load-strategy.c:
      	(nautilus_adapter_stream_load_strategy_load_location,
      	nautilus_adapter_stream_load_strategy_stop_loading): Removed print
      	statements.
      
      	* components/adapter/nautilus-adapter.c:
      	(nautilus_adapter_destroy): Free stuff.
      
      	(nautilus_adapter_new): Use the new embed strategy stuff.
      
      	(nautilus_adapter_open_location_callback): callback for signal
      	handler attached to embed strategy.
      
      	* src/nautilus-view-frame-bonobo-control.c,
      	src/nautilus-view-frame-bonobo-embeddable.c: Removed.
      	* src/nautilus-view-frame-private.h, src/Makefile.am: Remove
      	mentions of the two preceding files.
      
      	* src/nautilus-view-frame.c (nautilus_view_frame_load_client): Use
      	the adapter to host non-nautilus-native components.
      
      	* nautilus-clean.sh: Added image view.
      c70683fe