diff options
author | Darin Adler <darin@src.gnome.org> | 2000-12-09 01:13:45 +0000 |
---|---|---|
committer | Darin Adler <darin@src.gnome.org> | 2000-12-09 01:13:45 +0000 |
commit | 134e132a7e2847830ebe14a8fb28b46b246a3325 (patch) | |
tree | e39c29da35c2d0bb906a68466ec7472a43ab8e16 /libnautilus-extensions/Makefile.am | |
parent | 76b5dd2512312b1212a3a6d0e44518c1a82bfb32 (diff) | |
download | nautilus-134e132a7e2847830ebe14a8fb28b46b246a3325.tar.gz |
reviewed by: John Sullivan <sullivan@eazel.com>
Fixed bug 2244 (trash window sidebar should have trash icon).
* libnautilus-extensions/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_directory): Added code to
give the trash its own icon.
(nautilus_icon_factory_get_icon_for_file): Rearranged to simplify
it a bit.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-trash-monitor.h:
* libnautilus-extensions/nautilus-trash-monitor.c:
Moved trash monitor to here.
(nautilus_trash_files_changed_callback): Do nautilus_file_changed
on the trash NautilusFile object when the state changes from full
to empty or from empty to full.
* src/file-manager/Makefile.am:
* src/file-manager/nautilus-trash-monitor.h:
* src/file-manager/nautilus-trash-monitor.c:
Moved trash monitor from here.
* src/file-manager/fm-desktop-icon-view.c:
* src/file-manager/fm-directory-view.c:
Changed includes to include trash monitor from new location.
* libnautilus-extensions/nautilus-directory-metafile.c:
(get_metadata_string_from_metafile),
(get_metadata_list_from_metafile),
(set_metadata_string_in_metafile), (set_metadata_list_in_metafile):
Remove some dead code left over from handling of directory metadata.
We don't have directory metadata any more, only file metadata.
Diffstat (limited to 'libnautilus-extensions/Makefile.am')
-rw-r--r-- | libnautilus-extensions/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am index 1d17097bf..802683907 100644 --- a/libnautilus-extensions/Makefile.am +++ b/libnautilus-extensions/Makefile.am @@ -124,6 +124,7 @@ libnautilus_extensions_la_SOURCES = \ nautilus-theme.c \ nautilus-thumbnails.c \ nautilus-trash-directory.c \ + nautilus-trash-monitor.c \ nautilus-undo-context.c \ nautilus-undo-manager.c \ nautilus-undo-signal-handlers.c \ @@ -222,6 +223,7 @@ noinst_HEADERS = \ nautilus-theme.h \ nautilus-thumbnails.h \ nautilus-trash-directory.h \ + nautilus-trash-monitor.h \ nautilus-undo-context.h \ nautilus-undo-manager.h \ nautilus-undo-signal-handlers.h \ |