Revision: 1081
http://geeqie.svn.sourceforge.net/geeqie/?rev=1081&view=rev
Author: zas_
Date: 2008-08-23 21:07:25 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
Fix another missing separator bug in image overlay. This one was occuring with
default string when no ISO data was available from exif.
Modified Paths:
--------------
trunk/src/image-overlay.c
Modified: trunk/src/image-overlay.c
===================================================================
--- trunk/src/image-overlay.c 2008-08-23 20:46:31 UTC (rev 1080)
+++ trunk/src/image-overlay.c 2008-08-23 21:07:25 UTC (rev 1081)
@@ -371,22 +371,23 @@
/* insert separator */
g_string_insert(new, pos, sep);
pos += strlen(sep);
+ want_separator = FALSE;
}
g_string_insert(new, pos, data);
pos += strlen(data);
}
- want_separator = FALSE;
-
if (pos-prev >= 1 && new->str[pos] == imp)
{
/* pipe character is replaced by a separator, delete it
* and raise a flag if needed */
g_string_erase(new, pos--, 1);
- want_separator = (data && *data);
+ want_separator |= (data && *data);
}
-
+
+ if (new->str[pos] == '\n') want_separator = FALSE;
+
prev = pos - 1;
g_free(name);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
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-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
