Merge tag 'upstream/0.26.2' into feature/upstream

Upstream version 0.26.2

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);
     }