diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-02-21 19:26:52 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-02-21 19:26:52 +0000 |
| commit | e4615d84461ab5703fa7653b01e737584f17ac23 (patch) | |
| tree | e2caba2b312aae9c0e306299929c348b2ea00772 /libnautilus-private/nautilus-directory-metafile-monitor.h | |
| parent | 004fb1ff2ca1a1da0827e212b5e3161105ea88ad (diff) | |
| download | nautilus-e4615d84461ab5703fa7653b01e737584f17ac23.tar.gz | |
Remove nautilus-desktop-file-loader.[ch]. Remove. Remove.
* 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.
Diffstat (limited to 'libnautilus-private/nautilus-directory-metafile-monitor.h')
| -rw-r--r-- | libnautilus-private/nautilus-directory-metafile-monitor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-directory-metafile-monitor.h b/libnautilus-private/nautilus-directory-metafile-monitor.h index 795e2132f..35fa83466 100644 --- a/libnautilus-private/nautilus-directory-metafile-monitor.h +++ b/libnautilus-private/nautilus-directory-metafile-monitor.h @@ -23,10 +23,9 @@ #ifndef NAUTILUS_METAFILE_MONITOR_H #define NAUTILUS_METAFILE_MONITOR_H -#include "nautilus-metafile-server.h" - #include <bonobo/bonobo-object.h> #include <libnautilus-private/nautilus-directory.h> +#include <libnautilus-private/nautilus-metafile-server.h> #define NAUTILUS_TYPE_METAFILE_MONITOR (nautilus_metafile_monitor_get_type ()) #define NAUTILUS_METAFILE_MONITOR(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_METAFILE_MONITOR, NautilusMetafileMonitor)) |