From 7dec5f41b2cffafe4d743273600e2868d116166d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 3 Jun 2017 08:54:49 +0200
Subject: New upstream version 0.26.2

---
 src/photos/PhotoMetadata.vala | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/photos/PhotoMetadata.vala')

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);
     }
-- 
cgit v1.2.3