diff options
| author | A. Walton <awalton@gnome.org> | 2008-06-16 16:14:21 +0000 |
|---|---|---|
| committer | Andrew Walton <awalton@src.gnome.org> | 2008-06-16 16:14:21 +0000 |
| commit | bd97574b8ca1995632774011b069a5bd53f6f8a2 (patch) | |
| tree | e0ed90e4fa83905d2a5341ac8410af3febe5c249 | |
| parent | 8490757ce39b8f487edc481273d91a5d8f1fa1b6 (diff) | |
| download | nautilus-bd97574b8ca1995632774011b069a5bd53f6f8a2.tar.gz | |
Remove the emblem-desktop from Nautilus, as GIO now returns the
2008-06-16 A. Walton <awalton@gnome.org>
* libnautilus-private/nautilus-emblem-utils.c
(is_reserved_keyword), (nautilus_emblem_should_show_in_list):
* libnautilus-private/nautilus-file.c
(prepend_automatic_keywords):
Remove the emblem-desktop from Nautilus, as GIO now returns the
user-desktop icon for the user's Desktop directory.
Closes bug #538152.
svn path=/trunk/; revision=14269
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-emblem-utils.c | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 4 |
3 files changed, 9 insertions, 11 deletions
@@ -1,3 +1,12 @@ +2008-06-16 A. Walton <awalton@gnome.org> + + * libnautilus-private/nautilus-emblem-utils.c + (is_reserved_keyword), (nautilus_emblem_should_show_in_list): + * libnautilus-private/nautilus-file.c (prepend_automatic_keywords): + Remove the emblem-desktop from Nautilus, as GIO now returns the + user-desktop icon for the user's Desktop directory. + Closes bug #538152. + 2008-06-16 Christian Neumair <cneumair@gnome.org> * libnautilus-private/nautilus-file-operations.c (copy_move_file): diff --git a/libnautilus-private/nautilus-emblem-utils.c b/libnautilus-private/nautilus-emblem-utils.c index 3e234bcd8..a1863339b 100644 --- a/libnautilus-private/nautilus-emblem-utils.c +++ b/libnautilus-private/nautilus-emblem-utils.c @@ -43,7 +43,6 @@ #define EMBLEM_NAME_NOREAD "emblem-noread" #define EMBLEM_NAME_NOWRITE "emblem-nowrite" #define EMBLEM_NAME_NOTE "emblem-note" -#define EMBLEM_NAME_DESKTOP "emblem-desktop" GList * nautilus_emblem_list_available (void) @@ -98,9 +97,6 @@ is_reserved_keyword (const char *keyword) if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_NOTE) == 0) { return TRUE; } - if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_DESKTOP) == 0) { - return TRUE; - } available = nautilus_emblem_list_available (); icon_name = nautilus_emblem_get_icon_name_from_keyword (keyword); @@ -131,9 +127,6 @@ nautilus_emblem_should_show_in_list (const char *emblem) if (strcmp (emblem, EMBLEM_NAME_NOTE) == 0) { return FALSE; } - if (strcmp (emblem, EMBLEM_NAME_DESKTOP) == 0) { - return FALSE; - } return TRUE; } diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index eef4b2cc1..35d75effe 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -2252,10 +2252,6 @@ prepend_automatic_keywords (NautilusFile *file, (names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_TRASH)); } #endif - if (nautilus_file_is_desktop_directory (file)) { - names = g_list_prepend - (names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_DESKTOP)); - } if (file_has_note (file)) { names = g_list_prepend (names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_NOTE)); |