gthumb r2278 - in trunk: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Mon Feb 11 13:48:54 2008
New Revision: 2278
URL: http://svn.gnome.org/viewvc/gthumb?rev=2278&view=rev

Log:
2008-02-11  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/comments.c: (load_comment_from_metadata):
        * libgthumb/comments.h:
        Removed unused function (comments_get_comment_as_xml_string).
        Only load DateTime metadata into comments if other metadata
        (comment, location, and/or keyword) has been loaded.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/comments.c
   trunk/libgthumb/comments.h

Modified: trunk/libgthumb/comments.c
==============================================================================
--- trunk/libgthumb/comments.c	(original)
+++ trunk/libgthumb/comments.c	Mon Feb 11 13:48:54 2008
@@ -403,10 +403,6 @@
                 data->place = g_strdup (metadata_string);
 	g_free (metadata_string);
 
-        metadata_time = get_metadata_time_from_fd (file, TAG_NAME_SETS[COMMENT_DATE_TAG_NAMES]);
-        if (metadata_time > (time_t) 0)
-                data->time = metadata_time;
-
         metadata_string = get_metadata_tagset_string (file, TAG_NAME_SETS[KEYWORD_TAG_NAMES]);
 	if (has_non_whitespace_comment (metadata_string)) {
 		char **keywords_v;
@@ -441,6 +437,19 @@
 		g_strfreev (keywords_v);
 	}
 
+	/* Only load the metadata time if the metadata contained useful comments,
+	   location data, or keywords. Almost all photos contain date metadata, so
+	   we do not want to crowd the comment display with date metadata unless
+	   it seems to be intentionally linked with other metadata. This may
+	   be a matter for further consideration. */
+	if ((data->comment != NULL) ||
+            (data->place != NULL) ||
+	    (data->keywords_n > 0)) {
+	        metadata_time = get_metadata_time_from_fd (file, TAG_NAME_SETS[COMMENT_DATE_TAG_NAMES]);
+        	if (metadata_time > (time_t) 0)
+                	data->time = metadata_time;
+	}
+
 	g_free (metadata_string);
         file_data_unref (file);
 
@@ -1057,11 +1066,3 @@
 	return _get_comment_as_string_common (data, sep1, sep2, FALSE);
 }
 
-
-char *
-comments_get_comment_as_xml_string (CommentData *data,
-				    char        *sep1,
-				    char        *sep2)
-{
-	return _get_comment_as_string_common (data, sep1, sep2, TRUE);
-}

Modified: trunk/libgthumb/comments.h
==============================================================================
--- trunk/libgthumb/comments.h	(original)
+++ trunk/libgthumb/comments.h	Mon Feb 11 13:48:54 2008
@@ -74,9 +74,6 @@
 char *         comments_get_comment_as_string      (CommentData *data,
 						    char        *sep1,
 						    char        *sep2);
-char *         comments_get_comment_as_xml_string  (CommentData *data,
-						    char        *sep1,
-						    char        *sep2);
 char*          _g_escape_text_for_html             (const gchar *text,
 						    gssize       length);