diff options
| author | Anders Carlsson <andersca@gnu.org> | 2002-11-20 12:19:53 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2002-11-20 12:19:53 +0000 |
| commit | 3a120e41f61e61f615be901f0fd90d2b385d0606 (patch) | |
| tree | 81ecc8239b57eafe2c62e08f33b875405ded6e35 | |
| parent | 614740540cd3bd0400293d4ad01ba58a051e8551 (diff) | |
| download | nautilus-3a120e41f61e61f615be901f0fd90d2b385d0606.tar.gz | |
Remove sample and loser from the default build.
2002-11-20 Anders Carlsson <andersca@gnu.org>
* components/Makefile.am:
Remove sample and loser from the default build.
* libnautilus-private/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_for_file):
Special-case the trash location so that it gets the correct icon.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | components/Makefile.am | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 11 |
3 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2002-11-20 Anders Carlsson <andersca@gnu.org> + + * components/Makefile.am: + Remove sample and loser from the default build. + + * libnautilus-private/nautilus-icon-factory.c: + (nautilus_icon_factory_get_icon_for_file): + Special-case the trash location so that it gets the correct icon. + 2002-11-19 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-properties-window.c: diff --git a/components/Makefile.am b/components/Makefile.am index b1ac67db0..aa566a394 100644 --- a/components/Makefile.am +++ b/components/Makefile.am @@ -4,9 +4,7 @@ SUBDIRS = \ adapter \ hardware \ history \ - loser \ notes \ - sample \ text \ throbber \ tree \ @@ -14,6 +12,9 @@ SUBDIRS = \ image_properties \ $(NULL) +# loser \ +# sample \ +# These should only be built by people that know what they do # news \ # Disable the news-sidebar for now, It has lots of bugs and doesn't diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 6ad74e049..9be776b7e 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -67,6 +67,9 @@ #define CACHE_SELF_CHECKS 0 #define ICON_NAME_THUMBNAIL_LOADING "gnome-fs-loading-icon" +#define ICON_NAME_TRASH_EMPTY "gnome-fs-trash-empty" +#define ICON_NAME_TRASH_FULL "gnome-fs-trash-full" + #define NAUTILUS_EMBLEM_NAME_PREFIX "emblem-" /* This used to be called ICON_CACHE_MAX_ENTRIES, but it's misleading @@ -702,6 +705,14 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file) g_free (custom_uri); file_uri = nautilus_file_get_uri (file); + + if (strcmp (file_uri, EEL_TRASH_URI) == 0) { + g_free (file_uri); + + return g_strdup (nautilus_trash_monitor_is_empty () + ? ICON_NAME_TRASH_EMPTY : ICON_NAME_TRASH_FULL); + } + mime_type = nautilus_file_get_mime_type (file); file_info = nautilus_file_peek_vfs_file_info (file); |