nautilus r14281 - in trunk: . libnautilus-private

[dobey svn gnome org]

Author: dobey
Date: Mon Jun 23 14:21:08 2008
New Revision: 14281
URL: http://svn.gnome.org/viewvc/nautilus?rev=14281&view=rev

Log:
2008-06-23  Rodney Dawes  <dobey pwns gmail com>

	* libnautilus-private/nautilus-emblem-utils.c:
	(is_reserved_keyword, nautilus_emblem_should_show_in_list):
	* libnautilus-private/nautilus-file.h:
	Add the emblem-shared icon to be hidden in the emblems dialog and
	to be used as a reserved keyword as well



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

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 23 14:21:08 2008
@@ -43,6 +43,7 @@
 #define EMBLEM_NAME_NOREAD  "emblem-noread"
 #define EMBLEM_NAME_NOWRITE "emblem-nowrite"
 #define EMBLEM_NAME_NOTE    "emblem-note"
+#define EMBLEM_NAME_SHARED  "emblem-shared"
 
 GList *
 nautilus_emblem_list_available (void)
@@ -97,6 +98,9 @@
 	if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_NOTE) == 0) {
 		return TRUE;
 	}
+	if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_SHARED) == 0) {
+		return TRUE;
+	}
 
 	available = nautilus_emblem_list_available ();
 	icon_name = nautilus_emblem_get_icon_name_from_keyword (keyword);
@@ -127,6 +131,9 @@
 	if (strcmp (emblem, EMBLEM_NAME_NOTE) == 0) {
 		return FALSE;
 	}
+	if (strcmp (emblem, EMBLEM_NAME_SHARED) == 0) {
+		return FALSE;
+	}
 
 	return TRUE;
 }

Modified: trunk/libnautilus-private/nautilus-file.h
==============================================================================
--- trunk/libnautilus-private/nautilus-file.h	(original)
+++ trunk/libnautilus-private/nautilus-file.h	Mon Jun 23 14:21:08 2008
@@ -87,6 +87,7 @@
 #define NAUTILUS_FILE_EMBLEM_NAME_TRASH "trash"
 #define NAUTILUS_FILE_EMBLEM_NAME_NOTE "note"
 #define NAUTILUS_FILE_EMBLEM_NAME_DESKTOP "desktop"
+#define NAUTILUS_FILE_EMBLEM_NAME_SHARED "shared"
 
 typedef void (*NautilusFileCallback)          (NautilusFile  *file,
 				               gpointer       callback_data);