implemented the has_annotation function

	* libnautilus-extensions/nautilus-annotation.c:
	(nautilus_annotation_has_annotation):
	implemented the has_annotation function

	* src/nautilus-property-browser.c: (add_reset_property):
	fixed bug 7021 by adding a line to turn the reset image into a
	property chit

4 files changed, 45 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1de0b922a..2c08402a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-26  Andy Hertzfeld  <set EMAIL_ADDRESS environment variable>
+
+
+	* libnautilus-extensions/nautilus-annotation.c:
+	(nautilus_annotation_has_annotation):
+	implemented the has_annotation function
+	
+	* src/nautilus-property-browser.c: (add_reset_property):
+	fixed bug 7021 by adding a line to turn the reset image into a
+	property chit
+	
 2001-02-25  Andy Hertzfeld  <andy@eazel.com>
 
 	finished first pass at underlying annotation infrastructure:
diff --git a/libnautilus-extensions/nautilus-annotation.c b/libnautilus-extensions/nautilus-annotation.c
index 4228ef3ba..32ffc53ad 100644
--- a/libnautilus-extensions/nautilus-annotation.c
+++ b/libnautilus-extensions/nautilus-annotation.c
@@ -866,6 +866,21 @@ char	*nautilus_annotation_get_annotation (NautilusFile *file)
  */
 int	nautilus_annotation_has_annotation (NautilusFile *file)
 {
+	char *digest_info, *digits, *temp_str;
+	int count;
+	
+	digest_info = nautilus_file_get_metadata (file, NAUTILUS_METADATA_KEY_NOTES_INFO, NULL);
+	if (digest_info != NULL) {
+		digits = strrchr (digest_info, ':');
+		count = atoi (digits + 1);
+		g_free (digest_info);
+		return count;
+	} else {
+		/* initiate fetching the annotations from the server */
+		temp_str = nautilus_annotation_get_annotation (file);
+		g_free (temp_str);	
+	}
+	g_free (digest_info);
 	return 0;
 }
 
diff --git a/libnautilus-private/nautilus-annotation.c b/libnautilus-private/nautilus-annotation.c
index 4228ef3ba..32ffc53ad 100644
--- a/libnautilus-private/nautilus-annotation.c
+++ b/libnautilus-private/nautilus-annotation.c
@@ -866,6 +866,21 @@ char	*nautilus_annotation_get_annotation (NautilusFile *file)
  */
 int	nautilus_annotation_has_annotation (NautilusFile *file)
 {
+	char *digest_info, *digits, *temp_str;
+	int count;
+	
+	digest_info = nautilus_file_get_metadata (file, NAUTILUS_METADATA_KEY_NOTES_INFO, NULL);
+	if (digest_info != NULL) {
+		digits = strrchr (digest_info, ':');
+		count = atoi (digits + 1);
+		g_free (digest_info);
+		return count;
+	} else {
+		/* initiate fetching the annotations from the server */
+		temp_str = nautilus_annotation_get_annotation (file);
+		g_free (temp_str);	
+	}
+	g_free (digest_info);
 	return 0;
 }
 
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 89b015daa..5829ed48e 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -1738,13 +1738,15 @@ add_reset_property (NautilusPropertyBrowser *property_browser)
 {
 	char *reset_image_file_name;
 	GtkWidget *reset_image;
-	GdkPixbuf *reset_pixbuf;
+	GdkPixbuf *reset_pixbuf, *reset_chit;
 
 	reset_image_file_name = g_strdup_printf ("%s/%s/%s", NAUTILUS_DATADIR, "patterns", RESET_IMAGE_NAME);
 	reset_pixbuf = gdk_pixbuf_new_from_file (reset_image_file_name);
+	reset_chit = nautilus_customization_make_pattern_chit (reset_pixbuf, property_browser->details->property_chit, FALSE);
+	
 	g_free (reset_image_file_name);
 
-	reset_image = labeled_image_new (NULL, reset_pixbuf, RESET_IMAGE_NAME, 0);
+	reset_image = labeled_image_new (NULL, reset_chit, RESET_IMAGE_NAME, 0);
 	gtk_container_add (GTK_CONTAINER (property_browser->details->content_table), reset_image);
 	nautilus_wrap_table_reorder_child (NAUTILUS_WRAP_TABLE (property_browser->details->content_table),
 					   reset_image,