-
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