gthumb r2354 - in trunk: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Mon Jul 21 13:46:32 2008
New Revision: 2354
URL: http://svn.gnome.org/viewvc/gthumb?rev=2354&view=rev

Log:
2008-07-21  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/comments.c: (comment_delete), (save_comment):
        Partial fix for segfault when using edit->remove comment on
        image with no comment. The segfault is fixed, but the comment
        metadata is not removed from the image... bug #543771.



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

Modified: trunk/libgthumb/comments.c
==============================================================================
--- trunk/libgthumb/comments.c	(original)
+++ trunk/libgthumb/comments.c	Mon Jul 21 13:46:32 2008
@@ -292,6 +292,8 @@
 	comment_uri = comments_get_comment_filename (uri, TRUE);
 	file_unlink (comment_uri);
 	g_free (comment_uri);
+
+	/* TODO: delete comment metadata fields */
 }
 
 
@@ -580,14 +582,14 @@
 	if ((uri == NULL) || ! is_local_file (uri))
 		return;
 
-	if (save_embedded)
-		save_comment_to_metadata (uri, data);
-
 	if (comment_data_is_void (data)) {
 		comment_delete (uri);
 		return;
 	}
 
+	if (save_embedded)
+		save_comment_to_metadata (uri, data);
+
 	/* Convert data to strings. */
 
 	time_str = g_strdup_printf ("%ld", data->time);