1. 27 Feb, 2002 8 commits
    • Michael Meeks's avatar
      impl. (get_xalf_prefix): use gconf. · 57a1da0b
      Michael Meeks authored
      2002-02-27  Michael Meeks  <michael@ximian.com>
      
      	* libnautilus-private/nautilus-program-choosing.c
      	(concat_option_cb): impl.
      	(get_xalf_prefix): use gconf.
      
      	* libnautilus-private/nautilus.schemas: add Xalf bits.
      
      	* libnautilus-private/nautilus-global-preferences.c: ditto.
      
      	* libnautilus-private/nautilus-icon-container.c
      	(nautilus_icon_container_start_renaming_selected_item):
      	don't pass a font name, it isn't used anyway.
      
      	* libnautilus-private/nautilus-directory-async.c
      	(should_display_file_name): protect with
      	GNOME2_HAS_MEDUSA instead.
      57a1da0b
    • Michael Meeks's avatar
      pass a widget context to help pango. · c8fd8946
      Michael Meeks authored
      2002-02-27  Michael Meeks  <michael@ximian.com>
      
      	* libnautilus-private/nautilus-file-operations.c
      	(handle_transfer_overwrite, handle_transfer_vfs_error),
      	(handle_transfer_overwrite): pass a widget context to
      	help pango.
      	(extract_and_ellipsize_file_name_for_dialog),
      	(format_and_ellipsize_uri_for_dialog): pass pango context
      	to ellipsization.
      	(ellipsize_string_for_dialog): re-implement for pango.
      	(get_label_font): kill.
      c8fd8946
    • Darin Adler's avatar
      New (draw_one_tab_plain), (draw_one_tab_themed), (get_tab_width): Use · ea26c5ef
      Darin Adler authored
      	* src/nautilus-sidebar-tabs.c: (make_tab_text_layout): New
      	(draw_one_tab_plain), (draw_one_tab_themed), (get_tab_width):
      	Use common function to create PangoLayout so we don't forget
      	anything. The old code forgot to set the font description in
      	one case, leading to wrong-looking sidebar tabs.
      
      	* src/nautilus-theme-selector.h:
      	* src/nautilus-theme-selector.c: Minor cleanup.
      ea26c5ef
    • Dave Camp's avatar
      Removed. · 71a7d613
      Dave Camp authored
      2002-02-25  Dave Camp  <dave@ximian.com>
      
      	* components/news/nautilus-news-pixmaps.h: Removed.
      
      	* components/news/Makefile.am: Build
      	nautilus-cell-renderer-news.c, don't build
      	nautilus-news-pixmaps.h.
      
      	* components/news/nautilus-news.c:
      	(toggle_open_state), (rss_logo_callback),
      	(set_bonobo_properties), (rss_read_done_callback),
      	(max_items_changed), (set_views_for_mode), (switch_page),
      	(configure_button_clicked), (add_site_button_clicked),
      	(add_site_from_fields), (remove_selected_site),
      	(nautilus_news_load_location), (empty_message_size_allocate),
      	(set_up_edit_widgets), (set_up_configure_widgets),
      	(set_up_main_widgets), (make_news_view): use a GtkNotebook to
      	store the pages of the news view, and switch between them instead
      	of individually hiding and showing the widgets when pages are
      	flipped.  This allowed all the size negotiation code to go away,
      	as the GtkNotebook takes care of it.
      
      	* components/news/nautilus-news.c: (update_node),
      	(get_channel_markup), (get_item_markup), (set_bonobo_properties),
      	(do_destroy), (go_to_uri), (set_row_widths), (wrap_idle),
      	(nautilus_news_size_allocate), (node_data_for_path),
      	(nautilus_news_activate_path), (nautilus_news_row_activated),
      	(nautilus_news_button_release_event), (nautilus_news_set_title),
      	(free_rss_data_item), (free_channel),
      	(nautilus_news_set_news_changed), (clear_channel_changed_flags),
      	(nautilus_news_make_channel_document), (rss_logo_callback),
      	(extract_items), (has_matching_uri), (mark_new_items),
      	(extract_rss_title), (extract_scripting_news_title),
      	(rss_read_done_callback), (nautilus_news_insert_channel),
      	(nautilus_news_load_channel), (detach_items), (remove_items),
      	(update_channels), (update_items),
      	(nautilus_news_make_new_channel), (nautilus_news_add_channels),
      	(nautilus_news_load_images), (nautilus_news_cell_data_func),
      	(nautilus_news_row_expanded), (nautilus_news_row_collapsed),
      	(max_items_changed),
      	(add_channel_to_remove_list), (add_site_from_fields),
      	(remove_selected_site), (add_command_buttons),
      	(nautilus_news_load_location), (add_channel_entry),
      	(empty_message_size_allocate), (make_remove_widgets),
      	(set_up_configure_widgets), (set_up_main_widgets),
      	(make_news_view):  Use a GtkTreeView to render the news.
      
      	(make_news_view): Remove the #ifdef GNOME2_CONVERSION_COMPLETE
      	and send the proper arguments to bonobo_control_set_properties.
      	(nautilus_news_set_news_changed): Remove the #ifdef
      	GNOME2_CONVERSION_COMPLETE and replace
      	bonobo_property_bag_notify_listeners with a
      	bonobo_event_source_notify_listeners_full call.
      71a7d613
    • Alexander Larsson's avatar
      Fix typo that used NAUTILUS_ZOOM_LEVEL_STANDARD instead of · 4b6f6e0a
      Alexander Larsson authored
      2002-02-26  Alexander Larsson  <alla@lysator.liu.se>
      
      	* libnautilus-private/nautilus-icon-factory.c (load_icon_for_scaling):
      	Fix typo that used NAUTILUS_ZOOM_LEVEL_STANDARD instead of
      	NAUTILUS_ICON_SIZE_STANDARD. This made nautilus cache many icons twice.
      	(get_icon_from_cache): Need to handle the case where an inner
      	get_icon_from_cache call already put the icon in the cache.
      4b6f6e0a
    • Darin Adler's avatar
      Remove stray line of code. · 5bfec7b1
      Darin Adler authored
      	* libnautilus-private/nautilus-icon-container.c:
      	(nautilus_icon_container_set_font_size_table): Remove stray line of code.
      
      	* libnautilus-private/nautilus-icon-private.h: Remove unused field.
      5bfec7b1
    • Michael Meeks's avatar
      fix the undo manager impl. to map the servant properly. · a02c428e
      Michael Meeks authored
      2002-02-27  Michael Meeks  <michael@ximian.com>
      
      	* libnautilus-private/nautilus-undo-manager.c
      	(corba_append, corba_forget, corba_undo): fix the
      	undo manager impl. to map the servant properly.
      
      2002-02-26  Michael Meeks  <michael@ximian.com>
      
      	* libnautilus-private/nautilus-entry.c
      	(nautilus_entry_get_type): write out in full so we
      	can handle the editable interface.
      	(nautilus_entry_editable_init): setup the editable
      	interface.
      	(nautilus_entry_set_selection_bounds),
      	(nautilus_entry_insert_text),
      	(nautilus_entry_delete_text): re-instate.
      a02c428e
    • Darin Adler's avatar
      Simplified calls to bonobo_object_ref/unref. · f5874fd2
      Darin Adler authored
      	* Many files:
      	Simplified calls to bonobo_object_ref/unref.
      
      	* components/history/nautilus-history-view.c: (update_history):
      	Fixed so that a history update while one is already in progress
      	will work properly.
      
      	* libnautilus/nautilus-view.c:
      	(remove_listener): New.
      	(update_listener): Renamed from nautilus_view_set_frame, made it
      	handle various cases better. Fixed leak of property bag.
      	(forget_cached_view_frame): New.
      	(nautilus_view_set_frame_callback): Use new forget_cached_view_frame
      	and update_listener.
      	(nautilus_view_construct_from_bonobo_control): Use
      	g_signal_connect_object.  Not sure if this is better, since they
      	are part of the same aggregate.
      	(nautilus_view_finalize): Use new forget_cached_view_frame and
      	remove_listener.
      	(nautilus_view_dispose): Use new forget_cached_view_frame and
      	remove_listener.
      	(nautilus_view_get_view_frame): Fixed leak of control frame.
      	(nautilus_view_set_listener_mask): Simplified, and made it work even
      	if you call it multiple times, by calling new update_listener.
      
      	* libnautilus-private/nautilus-icon-canvas-item.c:
      	(create_label_layout): Handle NULL font_name case just in case.
      	* libnautilus-private/nautilus-icon-container.c:
      	(nautilus_icon_container_set_zoom_level): Use
      	invalidate_label_sizes instead of setting update_icon_font.
      	(nautilus_icon_container_set_font_name): Do nothing if font name
      	doesn't change. If it does, use invalidate_label_sizes rather than
      	setting update_icon_font.
      	(nautilus_icon_container_set_font_size_table): Only redraw if font
      	size changes. Also, use invalidate_label_sizes rather than setting
      	update_icon_font.
      
      	* libnautilus-private/nautilus-directory.c:
      	(add_preferences_callbacks):
      	* libnautilus-private/nautilus-icon-factory.c: (get_icon_factory):
      	Initialize global preferences as needed.
      
      	* src/file-manager/fm-icon-view.c: (fm_icon_view_finalize):
      	* src/file-manager/fm-search-list-view.c: (real_destroy):
      	* src/nautilus-application.c: (nautilus_application_destroy),
      	(nautilus_application_create_window),
      	(nautilus_application_class_init):
      	* src/nautilus-main.c: (main):
      
      	* src/nautilus-view-frame.c: (create_corba_objects): Fix property
      	bag leak.
      f5874fd2
  2. 26 Feb, 2002 5 commits
  3. 25 Feb, 2002 11 commits
    • Darin Adler's avatar
      Bump version. · 757fffa9
      Darin Adler authored
      	* configure.in: Bump version.
      757fffa9
    • Anders Carlsson's avatar
      Doh, the timeout should be 50 msecs · a77d59c9
      Anders Carlsson authored
      a77d59c9
    • Anders Carlsson's avatar
      Use gtk_widget_get_toplevel to find out the top-level window. · c79cb558
      Anders Carlsson authored
      2002-02-26  Anders Carlsson  <andersca@gnu.org>
      
      	* libnautilus-private/nautilus-drag-window.c
      	(drag_begin_emission_callback):
      	Use gtk_widget_get_toplevel to find out the top-level
      	window.
      c79cb558
    • Anders Carlsson's avatar
      Get the don't-raise-on-drag feature working again. · 91505c78
      Anders Carlsson authored
      2002-02-25  Anders Carlsson  <andersca@gnu.org>
      
      	* libnautilus-private/nautilus-drag-window.c:
      	(wm_protocols_filter), (nautilus_drag_window_realize),
      	(nautilus_drag_window_register):
      	Get the don't-raise-on-drag feature working again.
      91505c78
    • Anders Carlsson's avatar
      Let "Loading" and "Empty" special nodes be italic. · 9f473be4
      Anders Carlsson authored
      2002-02-25  Anders Carlsson  <andersca@gnu.org>
      
      	* components/tree/nautilus-tree-model.c:
      	(nautilus_tree_model_get_column_type),
      	(nautilus_tree_model_get_value):
      	* components/tree/nautilus-tree-model.h:
      	* components/tree/nautilus-tree-view.c: (create_tree):
      	Let "Loading" and "Empty" special nodes be italic.
      
      	* libnautilus-private/nautilus-global-preferences.c:
      	(default_font_callback):
      	Return "sans" here instead of "fixed"
      
      	* libnautilus-private/nautilus-icon-canvas-item.c:
      	(draw_or_measure_label_text), (create_label_layout),
      	Set font from icon container name, use gdk_gc_set_rgb_fg_color.
      
      	* libnautilus-private/nautilus-icon-container.c: (finalize):
      	(realize), (nautilus_icon_container_init),
      	(nautilus_icon_container_update_icon),
      	(nautilus_icon_container_set_zoom_level),
      	(nautilus_icon_container_request_update_all),
      	(nautilus_icon_container_get_label_color), (update_label_color),
      	(nautilus_icon_container_theme_changed),
      	(nautilus_icon_container_set_font_name),
      	(nautilus_icon_container_set_font_size_table):
      	Add support for setting fonts, and fix some bugs with the
      	label color handling.
      
      	* libnautilus-private/nautilus-icon-container.h:
      	Add nautilus_icon_container_set_font_name and
      	nautilus_icon_container_set_font_size_table.
      
      	* libnautilus-private/nautilus-icon-factory.c:
      	(embedded_text_font_changed_callback), (embed_text):
      	Set the font of the embedded text to the default font.
      
      	* libnautilus-private/nautilus-icon-private.h:
      	Add font name and font size table variables to
      	NautilusIconContainerDetails.
      
      	* libnautilus-private/nautilus-program-chooser.c:
      	(nautilus_program_chooser_init):
      	Fix button ordering according to the HIG.
      
      	* src/file-manager/fm-icon-view.c:
      	(fm_icon_view_update_icon_container_fonts),
      	(fm_icon_view_update_icon_container_font_size_table):
      	Set font name and font size table in the icon container.
      
      	* src/nautilus-sidebar-tabs.c:
      	(nautilus_sidebar_tabs_load_theme_data),
      	(default_font_changed_callback), (nautilus_sidebar_tabs_init),
      	(nautilus_sidebar_tabs_destroy), (draw_one_tab_plain),
      	(draw_one_tab_themed):
      	Use the "default font" preference.
      
      	* src/nautilus-sidebar-title.c:
      	(nautilus_sidebar_title_class_init),
      	(default_font_changed_callback), (nautilus_sidebar_title_init),
      	(nautilus_sidebar_title_destroy), (update_title_font):
      	Use the "default font" preference.
      
      	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
      	Use the GnomeAbout widget.
      9f473be4
    • Michael Meeks's avatar
      kill deprecated code, use gtk_window_set_transient instead. · 21fb75e0
      Michael Meeks authored
      2002-02-25  Michael Meeks  <michael@ximian.com>
      
      	* libnautilus-private/nautilus-file-operations.c
      	(fit_rect_on_screen, center_dialog_over_rect),
      	(center_dialog_over_window): kill deprecated code, use
      	gtk_window_set_transient instead.
      
      	* libnautilus-private/nautilus-file-operations-progress.c
      	(nautilus_file_operations_progress_init): setup the default
      	dialog width instead of the bar's.
      
      2002-02-21  Michael Meeks  <michael@ximian.com>
      
      	* libnautilus-private/nautilus-customization-data.c
      	(add_reset_text): port, requires new eel API.
      21fb75e0
    • Alexander Larsson's avatar
      Render svg icons at the right size. · f8d89640
      Alexander Larsson authored
      f8d89640
    • Darin Adler's avatar
      Bump required versions of some things. · 21408006
      Darin Adler authored
      	* configure.in: Bump required versions of some things.
      21408006
    • Seth Nickell's avatar
      Convert deprecated use of GtkProgress to GtkProgressBar to fix the build. · 9643671c
      Seth Nickell authored
      2002-02-24  Seth Nickell  <snickell@stanford.edu>
      
      	* src/file-manager/nautilus-indexing-info.c:
      	(update_progress_display), (index_progress_dialog_new):
      
      	Convert deprecated use of GtkProgress to GtkProgressBar
      	to fix the build.
      9643671c
    • Alexander Larsson's avatar
      Enable gdk_window_set_back_pixmap() again. This limits flicker when · 5cc6bb00
      Alexander Larsson authored
      2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
      
      	* libnautilus-private/nautilus-directory-background.c (image_loading_done_callback):
      	Enable gdk_window_set_back_pixmap() again. This limits flicker when
      	switching workspaces and moving windows.
      5cc6bb00
    • Alexander Larsson's avatar
      Don't set background pixmap None. Gtk+ already does that when scrolling · a5db2885
      Alexander Larsson authored
      2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
      
      	* libnautilus-private/nautilus-icon-container.c (realize):
      	Don't set background pixmap None. Gtk+ already does that when
      	scrolling windows these days, and due to a bug in Gtk+ (now fixed)
      	this was actually making that feature not work!
      a5db2885
  4. 24 Feb, 2002 1 commit
  5. 23 Feb, 2002 2 commits
  6. 22 Feb, 2002 10 commits
    • Gediminas Paulauskas's avatar
      remove obsolete GNOME_COMMON_INIT and GNOME_PLATFORM_GNOME_2 macros. · eacf94ca
      Gediminas Paulauskas authored
      2002-02-22  Gediminas Paulauskas <menesis@delfi.lt>
      
      	* configure.in: remove obsolete
      	GNOME_COMMON_INIT and GNOME_PLATFORM_GNOME_2 macros.
      	* libnautilus-private/nautilus-file-operations.c
      	(handle_transfer_duplicate):
      	* libnautilus-private/nautilus-icon-dnd.c
      	(nautilus_icon_container_get_drop_action):
      	* libnautilus-private/nautilus-volume-monitor.c
      	(mount_volume_deactivate):
      	remove empty default: label to fix warning on gcc 3.
      	* libnautilus-private/nautilus-icon-container.c (clear_drag_state):
      	fix typo.
      eacf94ca
    • Darin Adler's avatar
      New. (clear_drag_state): Use remove_context_menu_timeout. · 01082312
      Darin Adler authored
      	* libnautilus-private/nautilus-icon-container.c:
      	(remove_context_menu_timeout): New.
      	(clear_drag_state): Use remove_context_menu_timeout.
      	(motion_notify_event): Use remove_context_menu_timeout.
      	This fixes a bug where you might end up with two timeouts.
      	Remove the code marked "KLUDGE ALERT" which seemed to mess
      	up dragging coordinates.
      01082312
    • Darin Adler's avatar
      Remove libbackground/applier.c, because it's not in the tarball, just in · bd4d58d8
      Darin Adler authored
      	* POTFILES.in: Remove libbackground/applier.c, because it's
      	not in the tarball, just in cvs, so it breaks tarball builds.
      	Remove nautilus-icon-text-item.c.
      	* POTFILES.skip: Remove image-viewer.
      bd4d58d8
    • Darin Adler's avatar
      Remove. Remove. · 4734587d
      Darin Adler authored
      	* libnautilus-private/Makefile.am:
      	* libnautilus-private/nautilus-icon-text-item.c: Remove.
      	* libnautilus-private/nautilus-icon-text-item.h: Remove.
      
      	* libnautilus-private/nautilus-file-dnd.h:
      	* libnautilus-private/nautilus-file-dnd.c:
      	(nautilus_drag_file_receive_dropped_keyword): Use const char *.
      
      	* libnautilus-private/nautilus-icon-container.c:
      	(rubberband_timeout_callback), (start_rubberbanding),
      	(update_stretch_at_idle), (button_release_event),
      	(motion_notify_event), (handle_icon_button_press):
      	* libnautilus-private/nautilus-icon-dnd.c: (icon_get_data_binder),
      	(nautilus_icon_container_position_shadow),
      	(receive_dropped_keyword), (receive_dropped_uri_list),
      	(nautilus_icon_container_find_drop_target),
      	(nautilus_icon_container_receive_dropped_icons),
      	(nautilus_icon_container_get_drop_action),
      	(nautilus_icon_dnd_update_drop_target),
      	(nautilus_icon_dnd_begin_drag):
      	Use eel_gtk_widget_get_button_event_location and
      	eel_gnome_canvas_widget_to_world and the other similar functions
      	to fix coordinate handling. Also some const char * fixes.
      
      	* libnautilus-private/nautilus-icon-private.h: window -> widget
      
      	* src/file-manager/fm-directory-view.h:
      	* src/file-manager/fm-directory-view.c:
      	fm_directory_get_selected_icon_locations ->
      	fm_directory_view_get_selected_icon_locations
      4734587d
    • Josh Barrow's avatar
      Changed my e-mail address. Screw the changelog entry... · c5bd891a
      Josh Barrow authored
      
      Changed my e-mail address.  Screw the changelog entry...
      c5bd891a
    • Christian Rose's avatar
      Updated Swedish translation. · 058595cc
      Christian Rose authored
      2002-02-22  Christian Rose  <menthos@menthos.com>
      
      	* sv.po: Updated Swedish translation.
      058595cc
    • Darin Adler's avatar
      Update names in a few places. · 130c90ea
      Darin Adler authored
      	* AUTHORS:
      	* HACKING:
      	* MAINTAINERS:
      	* README:
      	Update names in a few places.
      
      	* src/nautilus-main.c: (main): Remove obsolete ENABLE_NLS comment.
      130c90ea
    • Kjartan Maraas's avatar
      Remove #ifdef ENABLE_NLS since it's not supported in GNOME 2. Same here. · 2f175b24
      Kjartan Maraas authored
      2002-02-22  Kjartan Maraas  <kmaraas@gnome.org>
      
      	* components/hardware/main.c: Remove #ifdef ENABLE_NLS since it's not
      	supported in GNOME 2.
      	* components/music/fileinfo.c: Same here.
      	* libnautilus/nautilus-view-standard-main. Here too.
      	* src/nautilus-main.c: Same here.
      2f175b24
    • Kjartan Maraas's avatar
      Use GETTEXT_PACKAGE. Same here. Same here. Same here. Same. Same · 4d3325db
      Kjartan Maraas authored
      2002-02-22  Kjartan Maraas  <kmaraas@gnome.org>
      
      	* components/hardware/main.c: Use GETTEXT_PACKAGE.
      	* components/history/nautilus-history-view.c: Same here.
      	* components/music/main.c: Same here.
      	* components/news/nautilus-news.c: Same here.
      	* components/notes/nautilus-notes.c: Same.
      	* components/text/main.c: Same
      4d3325db
    • Jody Goldberg's avatar
      typo. · de328587
      Jody Goldberg authored
      2002-02-21  Jody Goldberg <jody@gnome.org>
      
      	* components/adapter/nautilus-adapter-control-factory-embed-strategy.c
      	  (nautilus_adapter_control_factory_embed_strategy_new) : typo.
      de328587
  7. 21 Feb, 2002 3 commits
    • Jody Goldberg's avatar
      add DISABLE_DEPRECATED_CFLAGS. ProgressiveDataSink is gone in gnome2. use · 39716926
      Jody Goldberg authored
      2002-02-20  Jody Goldberg <jody@gnome.org>
      
      	* components/adapter/Makefile.am : add DISABLE_DEPRECATED_CFLAGS.
      	* components/adapter/nautilus-adapter-load-strategy.c
      	(nautilus_adapter_load_strategy_get) : ProgressiveDataSink is gone in
      	  gnome2.
      	* components/adapter/nautilus-adapter-embed-strategy.c
      	(nautilus_adapter_embed_strategy_class_init) : use g_cclosure_marshal_*
      	  which are not deprecated.
      	(nautilus_adapter_embed_strategy_get) : try ControlFactory in place of
      	  Embeddable.
      	* components/adapter/nautilus-adapter-control-factory-embed-strategy.c :
      	* components/adapter/nautilus-adapter-control-factory-embed-strategy.c :
      	  Renamed from nautilus-adapter-embeddable-embed-strategy.c
      	  Convert to ControlFactory.
      	* components/adapter/nautilus-adapter-control-factory-embed-strategy.h :
      	  Convert to G_* casts.
      	* components/adapter/nautilus-adapter.c :
      	  s/gtk_signal_disconnect/g_signal_handler_disconnect/
      39716926
    • Darin Adler's avatar
      Remove. Michael already took it out of the tarball, so I am removing it · dea17912
      Darin Adler authored
      	* components/image-viewer/: Remove. Michael already took it out of the
      	tarball, so I am removing it from cvs for clarity.
      
      	* libnautilus-private/nautilus-icon-container.c:
      	(nautilus_icon_container_init): Use g_signal_connect_object with
      	G_CONNECT_SWAPPED instead of g_signal_connect_closure.
      
      	* src/nautilus-desktop-window.c: Some code cleanup.
      dea17912
    • Darin Adler's avatar
      Remove nautilus-desktop-file-loader.[ch]. Remove. Remove. · e4615d84
      Darin Adler authored
      	* libnautilus-private/Makefile.am: Remove nautilus-desktop-file-loader.[ch].
      	* libnautilus-private/nautilus-desktop-file-loader.c: Remove.
      	* libnautilus-private/nautilus-desktop-file-loader.h: Remove.
      
      	* libnautilus-private/nautilus-directory-async.c:
      	(link_info_nautilus_link_read_callback): Pass in NULL for the new
      	optional URI parameter for parsing existing link files.
      
      	* libnautilus-private/nautilus-link-desktop-file.h:
      	* libnautilus-private/nautilus-link-desktop-file.c:
      	Change to use GnomeDesktopItem instead of NautilusDesktopFile.
      
      	* libnautilus-private/nautilus-link.h:
      	* libnautilus-private/nautilus-link.c:
      	(nautilus_link_get_link_uri_given_file_contents),
      	(nautilus_link_get_link_name_given_file_contents),
      	(nautilus_link_get_link_icon_given_file_contents):
      	Add optional URI parameter for parsing existing link files. This
      	is passed down to the GnomeDesktopItem level, which can sometimes
      	do a better job if it knows the URI.
      
      	* src/file-manager/fm-directory-view.c: (activate_callback):
      	Change to use GnomeDesktopItem instead of NautilusDesktopFile. Also,
      	simplify error handling.
      
      	* Many files:
      	Fix includes to use <> style in headers more consistently, and remove
      	unnecessarily includes.
      e4615d84