gthumb r2457 - in branches/gthumb-2-10: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Thu Dec 18 20:42:25 2008
New Revision: 2457
URL: http://svn.gnome.org/viewvc/gthumb?rev=2457&view=rev

Log:
2008-12-18  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/comments.c: (load_comment_from_xml), (save_comment):
        Fixed XML comment reading. Bug #563956. Modified version of
        patch by Jef Driesen <jefdriesen hotmail com>.



Modified:
   branches/gthumb-2-10/ChangeLog
   branches/gthumb-2-10/libgthumb/comments.c

Modified: branches/gthumb-2-10/libgthumb/comments.c
==============================================================================
--- branches/gthumb-2-10/libgthumb/comments.c	(original)
+++ branches/gthumb-2-10/libgthumb/comments.c	Thu Dec 18 20:42:25 2008
@@ -728,12 +728,13 @@
 		return NULL;
 
 	comment_uri = comments_get_comment_filename (uri, TRUE);
-	if (! path_exists (comment_uri)) {
+	local_file = get_cache_filename_from_uri (comment_uri);
+	if (! path_exists (local_file)) {
 		g_free (comment_uri);
+		g_free (local_file);
 		return NULL;
 	}
-	
-	local_file = get_cache_filename_from_uri (comment_uri);
+
         doc = xmlParseFile (local_file);
 
 	g_free (comment_uri);
@@ -851,7 +852,7 @@
 
 	comment_uri = comments_get_comment_filename (uri, TRUE);
         local_file = get_cache_filename_from_uri (comment_uri);
-	dest_dir = remove_level_from_path (comment_uri);
+	dest_dir = remove_level_from_path (local_file);
 	if (ensure_dir_exists (dest_dir, 0700)) {
 		xmlSetDocCompressMode (doc, 3);
 		xmlSaveFile (local_file, doc);