Hello community,
here is the log from the commit of package messagelib for openSUSE:Factory
checked in at 2020-01-23 16:08:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/messagelib (Old)
and /work/SRC/openSUSE:Factory/.messagelib.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "messagelib"
Thu Jan 23 16:08:22 2020 rev:55 rq:765321 version:19.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/messagelib/messagelib.changes 2020-01-14
21:08:33.962798495 +0100
+++ /work/SRC/openSUSE:Factory/.messagelib.new.26092/messagelib.changes
2020-01-23 16:08:30.067550047 +0100
@@ -1,0 +2,7 @@
+Fri Jan 17 15:29:39 UTC 2020 - Luca Beltrame <lbeltr...@kde.org>
+
+- Add upstream patch to prevent attachments from being lost when
+ saving a message as a draft (kde#416369):
+ * 0001-Fix-Bug-416369-attachments-lost-draft-message.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-Bug-416369-attachments-lost-draft-message.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ messagelib.spec ++++++
--- /var/tmp/diff_new_pack.q63ScD/_old 2020-01-23 16:08:31.963551171 +0100
+++ /var/tmp/diff_new_pack.q63ScD/_new 2020-01-23 16:08:31.967551173 +0100
@@ -35,6 +35,8 @@
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-Bug-387061-Large-messages-don-t-display-in-the-v.patch
Patch1: 0002-Initialize-variable.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Fix-Bug-416369-attachments-lost-draft-message.patch
BuildRequires: extra-cmake-modules
BuildRequires: kdepim-apps-libs-devel
BuildRequires: kf5-filesystem
++++++ 0001-Fix-Bug-416369-attachments-lost-draft-message.patch ++++++
>From c3828a873a75ed7f54465e7d6acf88e81720d46f Mon Sep 17 00:00:00 2001
From: Laurent Montel <mon...@kde.org>
Date: Fri, 17 Jan 2020 14:08:51 +0100
Subject: [PATCH] Fix Bug 416369 - attachments lost draft message
FIXED: 5.13.2
BUG: 416369
---
messagecomposer/src/attachment/attachmentmodel.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/messagecomposer/src/attachment/attachmentmodel.cpp
b/messagecomposer/src/attachment/attachmentmodel.cpp
index f75ad003..360337ab 100644
--- a/messagecomposer/src/attachment/attachmentmodel.cpp
+++ b/messagecomposer/src/attachment/attachmentmodel.cpp
@@ -372,9 +372,11 @@ bool AttachmentModel::setData(const QModelIndex &index,
const QVariant &value, i
void AttachmentModel::addAttachment(const AttachmentPart::Ptr &part)
{
Q_ASSERT(!d->parts.contains(part));
- for (const AttachmentPart::Ptr &partElement : qAsConst(d->parts)) {
- if (partElement->url() == part->url()) {
- return;
+ if (!part->url().isEmpty()) {
+ for (const AttachmentPart::Ptr &partElement : qAsConst(d->parts)) {
+ if (partElement->url() == part->url()) {
+ return;
+ }
}
}
--
2.24.1
