nautilus r14269 - in trunk: . libnautilus-private

[awalton svn gnome org]

Author: awalton
Date: Mon Jun 16 16:14:21 2008
New Revision: 14269
URL: http://svn.gnome.org/viewvc/nautilus?rev=14269&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-emblem-utils.c
   trunk/libnautilus-private/nautilus-file.c

Modified: trunk/libnautilus-private/nautilus-emblem-utils.c
==============================================================================
--- trunk/libnautilus-private/nautilus-emblem-utils.c	(original)
+++ trunk/libnautilus-private/nautilus-emblem-utils.c	Mon Jun 16 16:14:21 2008
@@ -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 @@
 	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 @@
 	if (strcmp (emblem, EMBLEM_NAME_NOTE) == 0) {
 		return FALSE;
 	}
-	if (strcmp (emblem, EMBLEM_NAME_DESKTOP) == 0) {
-		return FALSE;
-	}
 
 	return TRUE;
 }

Modified: trunk/libnautilus-private/nautilus-file.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file.c	(original)
+++ trunk/libnautilus-private/nautilus-file.c	Mon Jun 16 16:14:21 2008
@@ -2252,10 +2252,6 @@
 			(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));