[Geeqie-svn] SF.net SVN: geeqie:[1315] trunk/src

[nadvornik]

Revision: 1315
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1315&view=rev
Author:   nadvornik
Date:     2008-12-23 22:42:57 +0000 (Tue, 23 Dec 2008)

Log Message:
-----------
allow writing of empty keywords/comment

Modified Paths:
--------------
    trunk/src/bar_info.c
    trunk/src/metadata.c
    trunk/src/metadata.h

Modified: trunk/src/bar_info.c
===================================================================
--- trunk/src/bar_info.c        2008-12-23 20:53:44 UTC (rev 1314)
+++ trunk/src/bar_info.c        2008-12-23 22:42:57 UTC (rev 1315)
@@ -403,7 +403,7 @@
        list = keyword_list_pull(bd->keyword_view);
        comment = comment_pull(bd->comment_view);
 
-       metadata_write(bd->fd, list, comment);
+       metadata_write(bd->fd, &list, &comment);
 
        string_list_free(list);
        g_free(comment);

Modified: trunk/src/metadata.c
===================================================================
--- trunk/src/metadata.c        2008-12-23 20:53:44 UTC (rev 1314)
+++ trunk/src/metadata.c        2008-12-23 22:42:57 UTC (rev 1315)
@@ -586,15 +586,15 @@
        return (comment && *comment) || (keywords && *keywords);
 }
 
-gint metadata_write(FileData *fd, GList *keywords, const gchar *comment)
+gint metadata_write(FileData *fd, GList **keywords, gchar **comment)
 {
        gint success = TRUE;
-       gint write_comment = (comment && comment[0]);
+       gint write_comment = (comment && *comment);
 
        if (!fd) return FALSE;
 
-       if (write_comment) success = success && metadata_write_string(fd, 
COMMENT_KEY, comment);
-       if (keywords) success = success && metadata_write_list(fd, KEYWORD_KEY, 
string_list_copy(keywords));
+       if (write_comment) success = success && metadata_write_string(fd, 
COMMENT_KEY, *comment);
+       if (keywords) success = success && metadata_write_list(fd, KEYWORD_KEY, 
string_list_copy(*keywords));
        
        if (options->metadata.sync_grouped_files)
                {
@@ -607,8 +607,8 @@
                        
                        if (filter_file_class(sfd->extension, 
FORMAT_CLASS_META)) continue; 
 
-                       if (write_comment) success = success && 
metadata_write_string(sfd, COMMENT_KEY, comment);
-                       if (keywords) success = success && 
metadata_write_list(sfd, KEYWORD_KEY, string_list_copy(keywords));
+                       if (write_comment) success = success && 
metadata_write_string(sfd, COMMENT_KEY, *comment);
+                       if (keywords) success = success && 
metadata_write_list(sfd, KEYWORD_KEY, string_list_copy(*keywords));
                        }
                }
 
@@ -730,7 +730,7 @@
                        }
                }
        
-       metadata_write(fd, keywords_list, comment);
+       metadata_write(fd, &keywords_list, &comment);
 
        string_list_free(keywords);
        g_free(comment);

Modified: trunk/src/metadata.h
===================================================================
--- trunk/src/metadata.h        2008-12-23 20:53:44 UTC (rev 1314)
+++ trunk/src/metadata.h        2008-12-23 22:42:57 UTC (rev 1315)
@@ -20,7 +20,7 @@
 
 
 
-gint metadata_write(FileData *fd, GList *keywords, const gchar *comment);
+gint metadata_write(FileData *fd, GList **keywords, gchar **comment);
 
 gint metadata_read(FileData *fd, GList **keywords, gchar **comment);
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Geeqie-svn mailing list
Geeqie-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-svn