1. 03 Jul, 2000 12 commits
    • Andy Hertzfeld's avatar
      fixed bug where themed sidebar tabs weren't stacking correctly. Fixed by · c8f6f960
      Andy Hertzfeld authored
      
      	fixed bug where themed sidebar tabs weren't stacking correctly.  Fixed
      	by using the actual tab height instead of the non-themed constant.
      	Also, added newer tab_pieces image.
      c8f6f960
    • Andy Hertzfeld's avatar
      made the sidebar title color be themable, and changed the color in the · 198ccfc0
      Andy Hertzfeld authored
      
      	made the sidebar title color be themable, and changed the color
      	in the arlo theme to white
      198ccfc0
    • Eskil Heyn Olsen's avatar
      Ensuring rpm build · 472dfcee
      Eskil Heyn Olsen authored
      472dfcee
    • Seth Nickell's avatar
      Necessary to make Nautilus compile after changing · 448a9ca4
      Seth Nickell authored
      2000-07-03  Seth Nickell  <seth@eazel.com>
      
      	* libnautilus-extensions/nautilus-file.c:
      	(nautilus_file_get_permissions_as_string),
      	(nautilus_file_is_symbolic_link):
      	* libnautilus-extensions/nautilus-icon-factory.c:
      	(nautilus_icon_factory_get_icon_name_for_file):
      	Necessary to make Nautilus compile after changing
      	GNOME_VFS_FILE_TYPE_BROKEN_SYMLINK to GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK
      	and removing the existing flag. See bug 1547 for more information on
      	breakages in the way Nautilus handles symbolic links (caused by the
      	GnomeVFS changes) such as detecting them in the first place.
      448a9ca4
    • Andy Hertzfeld's avatar
      implemented n-point gradients for Arlo. Right now they only work in · ae9f25f2
      Andy Hertzfeld authored
      
      	implemented n-point gradients for Arlo.  Right now they only
      	work in anti-aliased mode.  Changed the arlo theme to use
      	a 3-point gradient.
      ae9f25f2
    • Gene Z. Ragan's avatar
      Fixed problem with previous change to this file. Allocated a static epv. · 149fa4ae
      Gene Z. Ragan authored
      2000-07-03  Gene Z. Ragan  <gzr@eazel.com>
      
      	* libnautilus-extensions/bonobo-stream-vfs.c:
      	(bonobo_stream_vfs_class_init), (create_bonobo_stream_vfs):
      	Fixed problem with previous change to this file.  Allocated
      	a static epv.  Assigned this epv to the servants epv and then
      	alocated the individual elements in the structure.
      149fa4ae
    • Pavel Cisler's avatar
      Start adding support for dislaying dragged icon while dragging in a list · 178c8746
      Pavel Cisler authored
      2000-07-03  Pavel Cisler <pavel@eazel.com>
      
      	* libnautilus-extensions/nautilus-list.c:
      	(nautilus_list_drag_start), (nautilus_list_motion):
      	Start adding support for dislaying dragged icon while dragging
      	in a list view.
      178c8746
    • J Shane Culpepper's avatar
      Making summary view "I am just a view" until I can get the actual widget · 9fdd2d1d
      J Shane Culpepper authored
              *
              components/services/startup/nautilus-view/nautilus-service-startup-
              view.c:
              *
              components/services/summary/nautilus-view/nautilus-summary-view.c:
              (generate_summary_form), (generate_form_title):
      
              Making summary view "I am just a view" until I can get the actual
              widget finished.
      9fdd2d1d
    • Pavel Cisler's avatar
      Make the help component build properly -- convert the call · 757856df
      Pavel Cisler authored
      2000-07-02  Pavel Cisler <pavel@eazel.com>
      
      	* components/help/help-method.c: (convert_file_to_uri):
      	Make the help component build properly -- convert the call
      	gnome_vfs_mime_type_of_file to the new
      	gnome_vfs_get_file_mime_type.
      
      	* components/help/Makefile.am:
      	Turn on -Werror that would have caught the problem earlier.
      757856df
    • Andy Hertzfeld's avatar
      made sidebar tabs themable, and implemented Arlo style tabs, which are · 109d5ae0
      Andy Hertzfeld authored
      
      	made sidebar tabs themable, and implemented Arlo style tabs, which
      	are finished yet.
      109d5ae0
    • J Shane Culpepper's avatar
      Fixing cvsigore files · d30c230b
      J Shane Culpepper authored
      d30c230b
    • J Shane Culpepper's avatar
      Have all of the eazel: views hooked into the build now. Most of the · 5b851868
      J Shane Culpepper authored
      2000-07-02  J Shane Culpepper  <pepper@eazel.com>
      
              * components/services/Makefile.am:
              * components/services/login/nautilus-view/nautilus-login-view.c:
              (generate_form_title):
              * components/services/startup/lib/Makefile.am:
              * components/services/startup/lib/eazel-register.c:
              * components/services/startup/lib/eazel-register.h:
              * components/services/startup/nautilus-view/Makefile.am:
              * components/services/startup/nautilus-view/icons/Makefile.am:
              * components/services/startup/nautilus-view/main.c:
              (service_object_destroyed), (service_make_object), (main):
              *
              components/services/startup/nautilus-view/nautilus-service-startup-
              view.c: (generate_startup_form), (go_to_uri),
              (generate_form_title),
              (nautilus_service_startup_view_initialize_class),
              (nautilus_service_startup_view_initialize),
              (nautilus_service_startup_view_destroy),
              (nautilus_service_startup_view_get_nautilus_view), (is_location),
              (nautilus_service_startup_view_load_uri),
              (service_load_location_callback):
              *
              components/services/startup/nautilus-view/nautilus-service-startup-
              view.h:
      
              Have all of the eazel: views hooked into the build now.  Most of the
              backend parsing of eazel:login, eazel:inventory, eazel:summary,
              eazel:time, eazel:startup.  Most of these views don't look very good.
              That's the next task.
      5b851868
  2. 02 Jul, 2000 3 commits
    • Maciej Stachowiak's avatar
      Remove unnecessary debugging statement. · 57e9dea1
      Maciej Stachowiak authored
      	* components/tree/main.c (main): Remove unnecessary debugging
      	statement.
      
      	* components/tree/nautilus-tree-view.c
      	(nautilus_tree_view_insert_file): Partly fix bugzilla task 1524 -
      	show icons in tree view. Still need to
      57e9dea1
    • J Shane Culpepper's avatar
      cvsignore fixes. · ad236624
      J Shane Culpepper authored
      	* components/services/install/command-line/.cvsignore:
      	* components/services/install/lib/.cvsignore:
      	* components/services/login/lib/.cvsignore:
      	* components/services/summary/lib/.cvsignore:
      
      	cvsignore fixes.
      ad236624
    • J Shane Culpepper's avatar
      Moving the inventory view to its new home to make way for the new · 06a87807
      J Shane Culpepper authored
              * components/services/inventory/lib/Makefile.am:
              * components/services/inventory/lib/eazel-inventory-shared.c:
              (add_package_info), (read_proc_info), (add_info), (add_io_info),
              (add_hardware_info), (synchronize_configuration_metafile),
              (update_configuration_metafile), (create_configuration_metafile):
              * components/services/inventory/lib/eazel-inventory-shared.h:
              * components/services/inventory/nautilus-view/Makefile.am:
              *
              components/services/inventory/nautilus-view/nautilus-inventory-view
              .c: (generate_inventory_form), (gather_config_button_cb),
              (register_later_cb), (make_http_post_request), (go_to_uri),
              (get_home_uri), (update_now):
      
              Moving the inventory view to its new home to make way for the new
              bootstrap startup view.
      06a87807
  3. 01 Jul, 2000 8 commits
    • J Shane Culpepper's avatar
      Simple framework for inventory and summary views. Minor fixes to login · f06ef2ca
      J Shane Culpepper authored
              * components/services/inventory/nautilus-view/Makefile.am:
              * components/services/inventory/nautilus-view/main.c:
              (inventory_object_destroyed), (inventory_make_object), (main):
              *
              components/services/inventory/nautilus-view/nautilus-inventory-view
              .c: (generate_inventory_form), (entry_changed_cb),
              (inventory_button_cb), (maintenance_button_cb), (show_feedback),
              (generate_form_title), (nautilus_inventory_view_initialize_class),
              (nautilus_inventory_view_initialize),
              (nautilus_inventory_view_destroy),
              (nautilus_inventory_view_get_nautilus_view),
              (nautilus_inventory_view_load_uri),
              (inventory_load_location_callback):
              *
              components/services/inventory/nautilus-view/nautilus-inventory-view
              .h:
              *
              components/services/inventory/nautilus-view/nautilus-inventory-view
              .oafinfo:
              * components/services/login/nautilus-view/Makefile.am:
              * components/services/login/nautilus-view/main.c:
              (login_make_object):
              * components/services/summary/nautilus-view/Makefile.am:
              * components/services/summary/nautilus-view/main.c:
              (summary_object_destroyed), (summary_make_object), (main):
              *
              components/services/summary/nautilus-view/nautilus-summary-view.c:
              (generate_summary_form), (entry_changed_cb), (summary_button_cb),
              (maintenance_button_cb), (show_feedback), (generate_form_title),
              (nautilus_summary_view_initialize_class),
              (nautilus_summary_view_initialize),
              (nautilus_summary_view_destroy),
              (nautilus_summary_view_get_nautilus_view),
              (nautilus_summary_view_load_uri), (summary_load_location_callback):
              *
              components/services/summary/nautilus-view/nautilus-summary-view.h:
              *
              components/services/summary/nautilus-view/nautilus-summary-view.oaf
              info:
      
              Simple framework for inventory and summary views.  Minor fixes to
              login view.  All are clones of the same basic widget right now. I'll
              be adding the real widgets soon.
      f06ef2ca
    • Ramiro Estrugo's avatar
      Add code to display an installation wizard using the new druid. Its · 90506c16
      Ramiro Estrugo authored
      2000-06-30  Ramiro Estrugo  <ramiro@eazel.com>
      
      * src/nautilus-application.c: (display_installation_wizard),
      (nautilus_application_startup):
      Add code to display an installation wizard using the new druid.
      Its #ifdefed out until we do more real work on it.
      90506c16
    • Ramiro Estrugo's avatar
      Build the new nautilus druid. · cc585883
      Ramiro Estrugo authored
      2000-06-30  Ramiro Estrugo  <ramiro@eazel.com>
      
      * configure.in:
      * cut-n-paste-code/widgets/Makefile.am:
      Build the new nautilus druid.
      cc585883
    • Ramiro Estrugo's avatar
      Adding canvas pixbuf item check and flags, which are needed in order to · a325938f
      Ramiro Estrugo authored
      2000-06-30  Ramiro Estrugo  <ramiro@eazel.com>
      
      * configure.in:
      * src/Makefile.am:
      Adding canvas pixbuf item check and flags, which are needed in
      order to use the nautilus druid.
      a325938f
    • Ramiro Estrugo's avatar
      Update these items to properly use the canvas pixbuf beast. · fb6e939d
      Ramiro Estrugo authored
      2000-06-30  Ramiro Estrugo  <ramiro@eazel.com>
      
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-edge.c:
      (nautilus_druid_page_edge_construct):
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-finish.c:
      (nautilus_druid_page_finish_configure_size),
      (nautilus_druid_page_finish_construct),
      (nautilus_druid_page_finish_set_logo),
      (nautilus_druid_page_finish_set_watermark):
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-standard.c:
      (nautilus_druid_page_standard_construct):
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-start.c:
      (nautilus_druid_page_start_construct):
      Update these items to properly use the canvas pixbuf beast.
      fb6e939d
    • Ramiro Estrugo's avatar
      Globally rename the GnomeDruid to NautilusDruid to prevent · 735131f1
      Ramiro Estrugo authored
      namespace clashing with the gnome-libs-1-0 druid.
      735131f1
    • Ramiro Estrugo's avatar
      Importing the gnome-libs HEAD druid to the cut-n-paste toxic dump. · b3df07e8
      Ramiro Estrugo authored
      2000-06-30  Ramiro Estrugo  <ramiro@eazel.com>
      
      * cut-n-paste-code/widgets/nautilus-druid/.cvsignore:
      * cut-n-paste-code/widgets/nautilus-druid/Makefile.am:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-edge.c:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-edge.h:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-finish.c:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-finish.h:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-standard.c:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-standard.h:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-start.c:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page-start.h:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page.c:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid-page.h:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid.c:
      * cut-n-paste-code/widgets/nautilus-druid/nautilus-druid.h:
      Importing the gnome-libs HEAD druid to the cut-n-paste toxic
      dump.  Arlofication will proceed.
      b3df07e8
    • Andy Hertzfeld's avatar
      use gnome_vfs_xfer to install the novice home directory instead of a cp · f182bcc3
      Andy Hertzfeld authored
      
      	use gnome_vfs_xfer to install the novice home directory instead
      	of a cp commmand.  This fixes bug 1285.
      f182bcc3
  4. 30 Jun, 2000 8 commits
    • Andy Hertzfeld's avatar
      eliminated the toolbar icon theme and associated widgetry in preferences. · 146d22d5
      Andy Hertzfeld authored
      
      	eliminated the toolbar icon theme and associated widgetry in
      	preferences.  Instead, we use the general theming machinery
      	to select toolbar icons.
      146d22d5
    • Gene Z. Ragan's avatar
      A fix to make the setting of the vepv work. The extern vepv is gone, so we · 3f4115d6
      Gene Z. Ragan authored
      2000-06-30  Gene Z. Ragan  <gzr@eazel.com>
      
      	* libnautilus-extensions/bonobo-stream-vfs.c:
      	(create_bonobo_stream_vfs):
      	A fix to make the setting of the vepv work.  The extern
      	vepv is gone, so we now use the allocator functions.
      3f4115d6
    • Andy Hertzfeld's avatar
      fixed bug where the combine mode for backgrounds wasn't working properly · d4f093ec
      Andy Hertzfeld authored
      
      		fixed bug where the combine mode for backgrounds wasn't
      		working properly in the non-aa case, by setting flags
      		properly in the fake CanvasBuf.  Now the sidebar in the
      		arlo theme draws properly.
      d4f093ec
    • Fatih Demir's avatar
      Bzip2 > 1.0.0 compatability shoud work now. · 58d08c57
      Fatih Demir authored
      58d08c57
    • Andy Hertzfeld's avatar
      added a new theme for Arlo; added a "combine mode to nautilus background · b607318a
      Andy Hertzfeld authored
      
      	added a new theme for Arlo;
      	added a "combine mode to nautilus background that composites an
      	image background onto the colored one.
      b607318a
    • Eskil Heyn Olsen's avatar
      Doing a lot of slashing in the uninstall part. · 4a9caffb
      Eskil Heyn Olsen authored
      	* components/services/install/command-line/Makefile.am:
      	* components/services/install/command-line/eazel-uninstall.c:
      	(set_parameters_from_command_line), (progress_signal),
      	(uninstall_failed), (dep_check), (create_package), (done), (main):
      	* components/services/install/lib/Makefile.am:
      	* components/services/install/lib/eazel-install-object.c:
      	(eazel_install_uninstall_packages):
      	* components/services/install/lib/eazel-install-rpm-glue.c:
      	(uninstall_packages), (uninstall_a_package), (do_rpm_uninstall),
      	(eazel_install_prepare_rpm_system), (eazel_install_add_to_rpm_set),
      	(eazel_install_add_to_set), (eazel_install_fetch_rpm_dependencies),
      	(eazel_install_do_dependency_check), (eazel_install_ensure_deps),
      	(eazel_uninstall_upward_traverse),
      	(eazel_uninstall_downward_traverse), (eazel_uninstall_globber):
      	Doing a lot of slashing in the uninstall part.
      
      	* nautilus-installer/src/Makefile:
      	This is still checked in, as the installer isn't part of the build
      	tree.
      4a9caffb
    • Pavel Cisler's avatar
      Fixed some memory leaks. · e5c61a01
      Pavel Cisler authored
      2000-06-29  Pavel Cisler  <pavel@eazel.com>
      
      	Fixed some memory leaks.
      
      	* libnautilus-extensions/nautilus-mime-actions.c:
      	(nautilus_mime_get_short_list_components_for_uri):
      	Fix a leaked string.
      
      	* src/nautilus-zoom-control.c:
      	(nautilus_zoom_control_set_preferred_zoom_levels):
      	Fix a leaky setter call.
      
      	* test/Makefile.am:
      	Add a make target for a leak checker tester.
      
      	* test/nautilus-leak-checker.c:
      	(nautilus_leak_allocation_record_init),
      	(nautilus_leak_record_malloc), (nautilus_leak_record_realloc),
      	(nautilus_leak_record_free), (print_one_leak),
      	(nautilus_leak_print_leaks), (allocate_lots), (leak_mem2),
      	(leak_mem), (main):
      	* test/nautilus-leak-symbol-lookup.c:
      	(nautilus_leak_print_symbol_address):
      	Tweak the leak checker output a bit to make it more nicer and
      	indicate the level of stack frame grouping.
      
      	* src/nautilus-main.c: (print_leaks):
      	Tweak the parameters a bit to print more leaks.
      e5c61a01
    • Maciej Stachowiak's avatar
      Add VFS_CFLAGS · 5c8338b8
      Maciej Stachowiak authored
      	* components/tree/Makefile.am: Add VFS_CFLAGS
      
      	* components/tree/main.c (main): Initialize more libraries.
      
      	* components/tree/nautilus-tree-view.h,
      	components/tree/nautilus-tree-view.c: Many changes. The upshot is
      	that basic tree loading now works, but many details remain to be
      	fleshed out (individual bugs were filed on these).
      
      	* libnautilus-extensions/nautilus-directory-async.c:
      	(dequeue_pending_idle_callback), (directory_load_done): Try to
      	emit done signal exactly once when a monitor load is complete. But
      	I think this might be questionable, see below.
      
      	* libnautilus-extensions/nautilus-directory-private.h,
      	libnautilus-extensions/nautilus-directory.h,
      	libnautilus-extensions/nautilus-directory.c: Add the
      	"done_loading" signal for when a load initiated by monitoring is
      	done. I just realized this does the wrong thing when more than one
      	thing is monitoring at the same time (both get the signal), so
      	maybe it should be changed to a callback function passed to
      	nautilus_file_monitor_add, but that would be harder to implement.
      
      	(nautilus_directory_emit_done_loading): Function so the async code
      	can emit it.
      5c8338b8
  5. 29 Jun, 2000 8 commits
    • Ramiro Estrugo's avatar
      Add a small C wrapper for poking mozilla preferences. · e36b5a2e
      Ramiro Estrugo authored
      2000-06-29  Ramiro Estrugo  <ramiro@eazel.com>
      
      * components/mozilla/Makefile.am:
      * components/mozilla/mozilla-preferences.cpp:
      * components/mozilla/mozilla-preferences.h:
      Add a small C wrapper for poking mozilla preferences.
      
      * components/mozilla/nautilus-mozilla-content-view.c:
      (nautilus_mozilla_content_view_initialize):
      Poke some interesting preferences.
      
      * configure.in:
      If the mozilla component is being built, add a check for the c++
      compiler which is needed by the mozilla preferences C wrapper.
      e36b5a2e
    • Ali Abdin's avatar
      2000-06-29 Ali Abdin <aliabdin@aucegypt.edu · 9f93e607
      Ali Abdin authored
              * components/help/Makefile.am: Install the libvfs-help.so module
              in the right place. Closes Bug #919. (will not work though
              if Nautilus prefix != gnome-vfs prefix (unless a fix goes into
              gnome-vfs))
      
              * components/websearch/ntl-web-search.c:
              (web_search_populate_engines): Fix to make it look in the right
              place (WEB_SEARCH_DATADIR "/standard.eng" instead of
              WEB SEARCH_DATADIR "/ntl-web-search/standard.eng")
      9f93e607
    • Ramiro Estrugo's avatar
      Expose the fact that this component can grok file: and ftp: uris. · e63d022f
      Ramiro Estrugo authored
      2000-06-29  Ramiro Estrugo  <ramiro@eazel.com>
      
      * components/mozilla/nautilus-mozilla-content-view.oafinfo:
      Expose the fact that this component can grok file: and ftp: uris.
      e63d022f
    • Andy Hertzfeld's avatar
      added nautilus_directory_background_is_set and used it to enable/disable · ac5b5739
      Andy Hertzfeld authored
      
      	added nautilus_directory_background_is_set and used it to
      	enable/disable "reset background" menu item in fm-directory-view
      ac5b5739
    • Pavel Cisler's avatar
      Got rid of the crufty old way drag&drop motion used to handle updating the · 1e53144a
      Pavel Cisler authored
      2000-06-29  Pavel Cisler <pavel@eazel.com>
      
      	* libnautilus-extensions/nautilus-icon-dnd.h:
      	* libnautilus-extensions/nautilus-icon-dnd.c:
      	(nautilus_icon_dnd_init),
      	(nautilus_icon_dnd_begin_drag), (drag_motion_callback),
      	(drag_drop_callback):
      	* libnautilus-extensions/nautilus-icon-container.c:
      	(motion_notify_event), (key_press_event):
      	Got rid of the crufty old way drag&drop motion used to handle
      	updating the drop action.
      
      	* libnautilus-extensions/nautilus-drag.h:
      	* libnautilus-extensions/nautilus-icon-dnd.c:
      	* libnautilus-extensions/nautilus-drag.c:
      	(nautilus_drag_modifier_based_action):
      	Moved to the common drag&drop file so I can share it
      	between the list and icon view.
      
      	* libnautilus-extensions/nautilus-list.c:
      	(nautilus_list_initialize), (nautilus_list_motion),
      	(nautilus_list_drag_motion):
      
      	* libnautilus-extensions/nautilus-icon-dnd.c:
      	(confirm_switch_to_manual_layout):
      	Reformatted a bit.
      1e53144a
    • Rebecca Schulman's avatar
      Fixed assertion problem by adding set_search_controls method · 690592ac
      Rebecca Schulman authored
      2000-06-29  Rebecca Schulman  <rebecka@eazel.com>
      
      	* src/nautilus-complex-search-bar.c:
      	(nautilus_complex_search_bar_initialize_class),
      	(nautilus_complex_search_bar_set_search_controls):
      	Fixed assertion problem by adding set_search_controls
      	method
      690592ac
    • Andy Hertzfeld's avatar
      connected directory backgrounds up to the theming mechanism, and made · 595d9d4f
      Andy Hertzfeld authored
      
      	connected directory backgrounds up to the theming mechanism, and
      	made resetting them work properly.  Also, removed "Reset Background"
      	menu item.
      595d9d4f
    • Andy Hertzfeld's avatar
      integrated Erik Gustavsson's patches to make the slider work correctly at · d69a911b
      Andy Hertzfeld authored
      
      	integrated Erik Gustavsson's patches to make the slider work
      	correctly at arbitrary bit-rates, and also made the music view
      	use nautilus-directory-background for consistency and to save
      	code.  Also, fixed nautilus-directory-background by arranging
      	for it to receive metadata.
      d69a911b
  6. 28 Jun, 2000 1 commit
    • Rebecca Schulman's avatar
      added ability to add more criterion (still incomplete) · 936e97a0
      Rebecca Schulman authored
      2000-06-28  Rebecca Schulman  <rebecka@eazel.com>
      
      	* libnautilus-extensions/nautilus-search-uri.c:
      	(nautilus_simple_search_criteria_to_search_uri):
      	(add facility to make search uri's from simple
      	search queries )
      	* src/nautilus-complex-search-bar.c:
      	(nautilus_complex_search_bar_initialize_class),
      	(nautilus_complex_search_bar_initialize), (more_options_callback),
      	(add_file_type_search_criterion_callback),
      	(add_file_name_search_criterion_callback),
      	(add_file_location_search_criterion_callback),
      	(add_content_search_criterion_callback),
      	(add_size_search_criterion_callback),
      	(add_date_modified_search_criterion_callback),
      	(add_notes_search_criterion_callback),
      	(nautilus_complex_search_bar_get_location):
      	added ability to add more criterion (still incomplete)
      	* src/nautilus-complex-search-bar.h:
      	* src/nautilus-search-bar-criterion.c:
      	(nautilus_search_bar_criterion_file_type_new),
      	(nautilus_search_bar_criterion_file_name_new),
      	(nautilus_search_bar_criterion_location_new),
      	(nautilus_search_bar_criterion_content_new),
      	(nautilus_search_bar_criterion_size_new),
      	(nautilus_search_bar_criterion_add_to_search_bar),
      	(nautilus_search_bar_criterion_show):
      	added code to actually create various search
      	button criterion sets.
      	* src/nautilus-search-bar-criterion.h:
      	* src/nautilus-simple-search-bar.c:
      	(nautilus_simple_search_bar_initialize_class),
      	(nautilus_simple_search_bar_get_location),
      	(editable_activated_callback):
      	* src/nautilus-simple-search-bar.h:
      	Updated so that the search location
      	is done correctly.  Adjustments to
      	the nautilus-directory should
      	be all that is needed to make all of
      	this stuff work.
      	* src/nautilus-switchable-search-bar.c:
      	(nautilus_switchable_search_bar_initialize),
      	(nautilus_switchable_search_bar_get_location),
      	(nautilus_switchable_search_bar_set_search_controls):
      	Some widget changes, and search get_location
      	calls respective simple or complex search bar
      	get_location functions
      936e97a0