My patch for the comments-related segfault was incomplete, and as such, it broke
keywords in files whose metadata had keywords but no comments.
The attached patch fixes that (and still fixes the case where one searches on
comments and hits a file with keywords but no comments). Lastly, I would
imagine that there exists a failure mode where one searches for a keyword and
hits a file with a comment but no keyword, and I imagine this patch should fix
that case as well.
--xsdg
--- src.orig/bar_info.c 2008-11-06 09:14:14.000000000 +0000
+++ src/bar_info.c 2008-11-06 09:28:37.000000000 +0000
@@ -463,8 +463,13 @@
if (res1 && (!comment || *comment != comment1)) g_free(comment1);
if (res2 && (!comment || *comment != comment2)) g_free(comment2);
- // return FALSE on failure
- if (comment && !*comment)
+ // return FALSE in the following cases:
+ // - only looking for a comment and didn't find one
+ // - only looking for keywords and didn't find any
+ // - looking for either a comment or keywords, but found nothing
+ if ((!keywords && comment && !*comment) ||
+ (!comment && keywords && !*keywords) ||
+ ( comment && !*comment && keywords && !*keywords))
return FALSE;
return TRUE;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel
