Mercurial > geeqie.yaz
comparison src/metadata.c @ 1434:b106af9689db
More gboolean.
author | zas_ |
---|---|
date | Sat, 14 Mar 2009 20:07:23 +0000 |
parents | cf4029d10d38 |
children | b24391991f7f |
comparison
equal
deleted
inserted
replaced
1433:b4ad1d201279 | 1434:b106af9689db |
---|---|
33 } MetadataKey; | 33 } MetadataKey; |
34 | 34 |
35 static const gchar *group_keys[] = {KEYWORD_KEY, COMMENT_KEY, NULL}; /* tags that will be written to all files in a group */ | 35 static const gchar *group_keys[] = {KEYWORD_KEY, COMMENT_KEY, NULL}; /* tags that will be written to all files in a group */ |
36 | 36 |
37 static gboolean metadata_write_queue_idle_cb(gpointer data); | 37 static gboolean metadata_write_queue_idle_cb(gpointer data); |
38 static gint metadata_legacy_write(FileData *fd); | 38 static gboolean metadata_legacy_write(FileData *fd); |
39 static void metadata_legacy_delete(FileData *fd, const gchar *except); | 39 static void metadata_legacy_delete(FileData *fd, const gchar *except); |
40 | 40 |
41 | 41 |
42 | 42 |
43 /* | 43 /* |
236 *------------------------------------------------------------------- | 236 *------------------------------------------------------------------- |
237 * keyword / comment read/write | 237 * keyword / comment read/write |
238 *------------------------------------------------------------------- | 238 *------------------------------------------------------------------- |
239 */ | 239 */ |
240 | 240 |
241 static gint metadata_file_write(gchar *path, GHashTable *modified_xmp) | 241 static gboolean metadata_file_write(gchar *path, GHashTable *modified_xmp) |
242 { | 242 { |
243 SecureSaveInfo *ssi; | 243 SecureSaveInfo *ssi; |
244 GList *keywords = g_hash_table_lookup(modified_xmp, KEYWORD_KEY); | 244 GList *keywords = g_hash_table_lookup(modified_xmp, KEYWORD_KEY); |
245 GList *comment_l = g_hash_table_lookup(modified_xmp, COMMENT_KEY); | 245 GList *comment_l = g_hash_table_lookup(modified_xmp, COMMENT_KEY); |
246 gchar *comment = comment_l ? comment_l->data : NULL; | 246 gchar *comment = comment_l ? comment_l->data : NULL; |
266 secure_fprintf(ssi, "#end\n"); | 266 secure_fprintf(ssi, "#end\n"); |
267 | 267 |
268 return (secure_close(ssi) == 0); | 268 return (secure_close(ssi) == 0); |
269 } | 269 } |
270 | 270 |
271 static gint metadata_legacy_write(FileData *fd) | 271 static gboolean metadata_legacy_write(FileData *fd) |
272 { | 272 { |
273 gint success = FALSE; | 273 gboolean success = FALSE; |
274 gchar *metadata_pathl; | |
274 | 275 |
275 g_assert(fd->change && fd->change->dest); | 276 g_assert(fd->change && fd->change->dest); |
276 gchar *metadata_pathl; | |
277 | 277 |
278 DEBUG_1("Saving comment: %s", fd->change->dest); | 278 DEBUG_1("Saving comment: %s", fd->change->dest); |
279 | 279 |
280 metadata_pathl = path_from_utf8(fd->change->dest); | 280 metadata_pathl = path_from_utf8(fd->change->dest); |
281 | 281 |
284 g_free(metadata_pathl); | 284 g_free(metadata_pathl); |
285 | 285 |
286 return success; | 286 return success; |
287 } | 287 } |
288 | 288 |
289 static gint metadata_file_read(gchar *path, GList **keywords, gchar **comment) | 289 static gboolean metadata_file_read(gchar *path, GList **keywords, gchar **comment) |
290 { | 290 { |
291 FILE *f; | 291 FILE *f; |
292 gchar s_buf[1024]; | 292 gchar s_buf[1024]; |
293 MetadataKey key = MK_NONE; | 293 MetadataKey key = MK_NONE; |
294 GList *list = NULL; | 294 GList *list = NULL; |
402 g_free(metadata_pathl); | 402 g_free(metadata_pathl); |
403 g_free(metadata_path); | 403 g_free(metadata_path); |
404 } | 404 } |
405 } | 405 } |
406 | 406 |
407 static gint metadata_legacy_read(FileData *fd, GList **keywords, gchar **comment) | 407 static gboolean metadata_legacy_read(FileData *fd, GList **keywords, gchar **comment) |
408 { | 408 { |
409 gchar *metadata_path; | 409 gchar *metadata_path; |
410 gchar *metadata_pathl; | 410 gchar *metadata_pathl; |
411 gint success = FALSE; | 411 gboolean success = FALSE; |
412 | |
412 if (!fd) return FALSE; | 413 if (!fd) return FALSE; |
413 | 414 |
414 metadata_path = cache_find_location(CACHE_TYPE_METADATA, fd->path); | 415 metadata_path = cache_find_location(CACHE_TYPE_METADATA, fd->path); |
415 if (!metadata_path) return FALSE; | 416 if (!metadata_path) return FALSE; |
416 | 417 |