1. 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
  2. 26 Sep, 2000 1 commit
    • Darin Adler's avatar
      Fixed bug bug 3264 (Tree view shows no branches for directories, · 2cd5440e
      Darin Adler authored
      	...HACK... nodes visible), bug 3290 (changing directory or
      	refreshing causes Gdk to assert), bug 2420 (Need to free original
      	key when removing model node), and other assorted problems.
      
      	* components/tree/nautilus-tree-view.c: (insert_hack_node),
      	(remove_hack_node), (nautilus_tree_view_insert_model_node):
      	Fix problem where the hash table key was neither g_strdup'd on the
      	way in, nor g_free'd on the way out. This caused all the problems
      	with bad nesting in the tree view.
      
      	* nautilus-installer/src/installer.c: (create_pixmap):
      	* src/file-manager/fm-list-view.c: (install_row_images):
      	* src/nautilus-theme-selector.c: (add_theme):
      	Added more checks for NULL before calling gdk_bitmap_unref.
      
      	* src/file-manager/fm-directory-view.c: (no_items_showing):
      	Fixed a NautilusDirectory ref. count leak.
      
      	* libnautilus-extensions/nautilus-font-factory.c:
      	(unref_global_font_factory), (nautilus_get_current_font_factory):
      	Unref the font factory on exit.
      	(nautilus_font_factory_initialize_class), (font_hash_node_free),
      	(free_one_hash_node), (destroy): Added code to actually destroy
      	the font factory.
      	(unref_fixed_font), (nautilus_font_factory_get_fallback_font):
      	Unref the fixed font on exit.
      	* libnautilus-extensions/nautilus-volume-monitor.c:
      	(unref_global_volume_monitor), (nautilus_volume_monitor_get):
      	Unref the volume monitor on exit.
      	* src/nautilus-signaller.c: (unref_global_signaller),
      	(nautilus_signaller_get_current): Unref the signaller on exit.
      
      	* src/nautilus-component-adapter-factory.c:
      	(nautilus_component_adapter_factory_initialize): Replaced some
      	strange FIXMEs with a simpler one.
      	(nautilus_component_adapter_factory_destroy): Fix a CORBA object
      	reference leak.
      	(nautilus_component_adapter_factory_get): Did a ref/sink.
      
      	* components/adapter/nautilus-adapter-control-embed-strategy.c:
      	(nautilus_adapter_control_embed_strategy_new):
      	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
      	(nautilus_adapter_embeddable_embed_strategy_new):
      	* components/adapter/nautilus-adapter-file-load-strategy.c:
      	(nautilus_adapter_file_load_strategy_new):
      	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
      	(nautilus_adapter_progressive_load_strategy_new):
      	* components/adapter/nautilus-adapter-stream-load-strategy.c:
      	(nautilus_adapter_stream_load_strategy_new):
      	* components/adapter/nautilus-adapter.c: (nautilus_adapter_new):
      	* components/rpmview/nautilus-rpm-verify-window.c:
      	(nautilus_rpm_verify_window_new):
      	* components/services/install/lib/eazel-install-object.c:
      	(eazel_install_new), (eazel_install_new_with_config):
      	* components/services/time/service/trilobite-eazel-time-service.c:
      	(trilobite_eazel_time_service_new):
      	* components/services/trilobite/libtrilobite/trilobite-service-pass
      	wordquery.c: (trilobite_passwordquery_new):
      	* components/services/trilobite/libtrilobite/trilobite-service.c:
      	(trilobite_service_new):
      	* components/tree/nautilus-tree-expansion-state.c:
      	(nautilus_tree_expansion_state_new):
      	* components/tree/nautilus-tree-model.c: (nautilus_tree_model_new):
      	* components/tree/nautilus-tree-node.c: (nautilus_tree_node_new):
      	* cut-n-paste-code/widgets/e-paned/e-hpaned.c: (e_hpaned_new):
      	* cut-n-paste-code/widgets/e-paned/e-vpaned.c: (e_vpaned_new):
      	* libnautilus-extensions/bonobo-stream-vfs.c:
      	(bonobo_stream_create):
      	* libnautilus-extensions/nautilus-any-width-bin.c:
      	(nautilus_any_width_bin_new):
      	* libnautilus-extensions/nautilus-background.c:
      	(nautilus_background_new):
      	* libnautilus-extensions/nautilus-bookmark.c:
      	(nautilus_bookmark_new_with_icon):
      	* libnautilus-extensions/nautilus-caption-table.c:
      	(nautilus_caption_table_new):
      	* libnautilus-extensions/nautilus-caption.c:
      	(nautilus_caption_new):
      	* libnautilus-extensions/nautilus-directory.c:
      	(nautilus_directory_new):
      	* libnautilus-extensions/nautilus-druid-page-eazel.c:
      	(nautilus_druid_page_eazel_new),
      	(nautilus_druid_page_eazel_new_with_vals):
      	* libnautilus-extensions/nautilus-druid.c: (nautilus_druid_new):
      	* libnautilus-extensions/nautilus-entry.c: (nautilus_entry_new):
      	* libnautilus-extensions/nautilus-file-operations-progress.c:
      	(nautilus_file_operations_progress_new):
      	* libnautilus-extensions/nautilus-file.c:
      	(nautilus_file_new_from_name), (nautilus_file_new_from_info):
      	* libnautilus-extensions/nautilus-font-picker.c:
      	(nautilus_font_picker_new):
      	* libnautilus-extensions/nautilus-horizontal-splitter.c:
      	(nautilus_horizontal_splitter_new):
      	* libnautilus-extensions/nautilus-icon-container.c:
      	(nautilus_icon_container_new):
      	* libnautilus-extensions/nautilus-icon-factory.c:
      	(get_icon_factory):
      	* libnautilus-extensions/nautilus-image.c: (nautilus_image_new):
      	* libnautilus-extensions/nautilus-keep-last-vertical-box.c:
      	(nautilus_keep_last_vertical_box_new):
      	* libnautilus-extensions/nautilus-label.c: (nautilus_label_new):
      	* libnautilus-extensions/nautilus-list-column-title.c:
      	(nautilus_list_column_title_new):
      	* libnautilus-extensions/nautilus-list.c:
      	(nautilus_list_new_with_titles):
      	* libnautilus-extensions/nautilus-password-dialog.c:
      	(nautilus_password_dialog_new):
      	* libnautilus-extensions/nautilus-preference.c:
      	(nautilus_preference_new_from_type):
      	* libnautilus-extensions/nautilus-preferences-box.c:
      	(nautilus_preferences_box_new):
      	* libnautilus-extensions/nautilus-preferences-dialog.c:
      	(nautilus_preferences_dialog_new):
      	* libnautilus-extensions/nautilus-preferences-group.c:
      	(nautilus_preferences_group_new):
      	* libnautilus-extensions/nautilus-preferences-item.c:
      	(nautilus_preferences_item_new):
      	* libnautilus-extensions/nautilus-preferences-pane.c:
      	(nautilus_preferences_pane_new):
      	* libnautilus-extensions/nautilus-radio-button-group.c:
      	(nautilus_radio_button_group_new):
      	* libnautilus-extensions/nautilus-scalable-font.c:
      	(nautilus_scalable_font_new):
      	* libnautilus-extensions/nautilus-string-picker.c:
      	(nautilus_string_picker_new):
      	* libnautilus-extensions/nautilus-text-caption.c:
      	(nautilus_text_caption_new):
      	* libnautilus-extensions/nautilus-undo-context.c:
      	(nautilus_undo_context_new):
      	* libnautilus-extensions/nautilus-undo-manager.c:
      	(nautilus_undo_manager_new):
      	* libnautilus-extensions/nautilus-user-level-manager.c:
      	(user_level_manager_new):
      	* libnautilus/nautilus-undo-transaction.c:
      	(nautilus_undo_transaction_new):
      	* libnautilus/nautilus-view.c:
      	(nautilus_view_new_from_bonobo_control):
      	* src/file-manager/nautilus-trash-monitor.c:
      	(nautilus_trash_monitor_get):
      	* src/nautilus-desktop-window.c: (nautilus_desktop_window_new):
      	* src/nautilus-property-browser.c: (nautilus_property_browser_new):
      	* src/nautilus-shell.c: (nautilus_shell_new):
      	* src/nautilus-sidebar-tabs.c: (nautilus_sidebar_tabs_new):
      	* src/nautilus-sidebar-title.c: (nautilus_sidebar_title_new):
      	* src/nautilus-sidebar.c: (nautilus_sidebar_create_context_menu),
      	(nautilus_sidebar_new):
      	* src/nautilus-theme-selector.c: (nautilus_theme_selector_new):
      	* src/nautilus-throbber.c: (nautilus_throbber_new):
      	* src/nautilus-view-frame.c: (nautilus_view_frame_new):
      	* src/nautilus-zoom-control.c: (nautilus_zoom_control_new):
      	* src/nautilus-about.c: (nautilus_about_new):
      	* src/nautilus-application.c: (nautilus_application_new),
      	(nautilus_application_create_window):
      	* src/nautilus-bookmark-list.c: (nautilus_bookmark_list_new):
      	After Tim Janik explained that gtk_type_new is a low-level call to
      	be avoided, changed most uses of gtk_type_new to gtk_object_new or
      	gtk_widget_new. Also, after Owen and Havoc explained that you
      	can't just ignore the floating bit, added ref/sink calls to the
      	functions used to create objects where we don't use the floating
      	scheme.
      
      	* src/nautilus-zoom-control.c:
      	(nautilus_zoom_control_button_press_event): Take advantage of the
      	fact that the new menu is floating and don't bother with ref'ing.
      
      	* libnautilus-extensions/nautilus-ctree.c:
      	(nautilus_ctree_new_with_titles):
      	Added a cast.
      
      	* components/adapter/main.c: (adapter_factory_make_object):
      	* components/hardware/main.c: (hardware_view_make_object):
      	* components/services/install/lib/eazel-install-corba-callback.c:
      	(eazel_install_callback_get_type), (eazel_install_callback_new):
      	* libnautilus-extensions/nautilus-theme.c:
      	(nautilus_theme_get_theme), (nautilus_theme_set_theme),
      	(nautilus_theme_get_theme_data):
      	Whitespace tweaks.
      2cd5440e
  3. 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