summaryrefslogtreecommitdiff
path: root/src/photos/PhotoMetadata.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-03 08:56:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-03 08:56:13 +0200
commitdaa075af9bd5f5818cb5ca4bc6f8118ccf0df7ab (patch)
treed2d09c2961bf5617cc57744d1684e5aef23e886c /src/photos/PhotoMetadata.vala
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parent7dec5f41b2cffafe4d743273600e2868d116166d (diff)
Merge tag 'upstream/0.26.2' into feature/upstream
Upstream version 0.26.2
Diffstat (limited to 'src/photos/PhotoMetadata.vala')
-rw-r--r--src/photos/PhotoMetadata.vala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 7764415..e9a9042 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -970,8 +970,13 @@ public class PhotoMetadata : MediaMetadata {
public void set_comment(string? comment,
SetOption option = SetOption.ALL_DOMAINS) {
+ /* https://bugzilla.gnome.org/show_bug.cgi?id=781897 - Do not strip
+ * newlines from comments */
if (!is_string_empty(comment))
- set_all_string(COMMENT_TAGS, comment, option);
+ set_all_generic(COMMENT_TAGS, option, (tag) => {
+ set_string(tag, comment, PREPARE_STRING_OPTIONS &
+ ~PrepareInputTextOptions.STRIP_CRLF);
+ });
else
remove_tags(COMMENT_TAGS);
}