[SCM] plasma-framework packaging branch, master, updated. debian/5.28.0-1-12-g9259880

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=f853c34

The following commit has been merged in the master branch:
commit f853c34792007c0fd1124f106be5e1afc0c4b56a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Apr 8 16:14:52 2017 +0200

    Add "Ref/deref DataEngines even if the metadata is invalid" (586ed85)
    
    Just because the metadata is invalid doesn't mean the DataEngine
    actually failed to load, we're still returning a valid object, and as
    seen with the MPris DataEngine bug. It's important that we still release
    it properly.
    
    Add upstream patch as:
     Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch
    This is related to KDE#374531
    
    Gbp-Dch: Full
---
 ...taEngines-even-if-the-metadata-is-invalid.patch | 64 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 65 insertions(+)

diff --git a/debian/patches/Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch b/debian/patches/Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch
new file mode 100644
index 0000000..d461a5b
--- /dev/null
+++ b/debian/patches/Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch
@@ -0,0 +1,64 @@
+From: David Edmundson <kde at davidedmundson.co.uk>
+Date: Mon, 6 Mar 2017 00:12:27 +0000
+Subject: Ref/deref DataEngines even if the metadata is invalid
+
+Summary:
+Just because the metadata is invalid doesn't mean the DataEngine
+actually failed to load, we're still returning a valid object, and as
+seen with the MPris DataEngine bug. It's important that we still release
+it properly.
+
+It looks like this was designed to make sure you don't delete the null
+data engine multiple times, but that shouldn't cause an issue here.
+
+Test Plan: #plasma
+
+Reviewers: #plasma, mart
+
+Reviewed By: mart
+
+Subscribers: plasma-devel, #frameworks
+
+Tags: #plasma, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D4556
+---
+ src/plasma/dataengine.cpp         | 2 --
+ src/plasma/dataengineconsumer.cpp | 7 +------
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/src/plasma/dataengine.cpp b/src/plasma/dataengine.cpp
+index 1c3efb656..dc03b13bd 100644
+--- a/src/plasma/dataengine.cpp
++++ b/src/plasma/dataengine.cpp
+@@ -425,8 +425,6 @@ DataEnginePrivate::DataEnginePrivate(DataEngine *e, const KPluginInfo &info, con
+     if (dataEngineDescription.isValid()) {
+         valid = true;
+         e->setObjectName(dataEngineDescription.name());
+-    } else {
+-        e->setObjectName(QStringLiteral("NullEngine"));
+     }
+ 
+     if (dataEngineDescription.isValid()) {
+diff --git a/src/plasma/dataengineconsumer.cpp b/src/plasma/dataengineconsumer.cpp
+index f734a9cca..b761aa076 100644
+--- a/src/plasma/dataengineconsumer.cpp
++++ b/src/plasma/dataengineconsumer.cpp
+@@ -95,16 +95,11 @@ DataEngine *DataEngineConsumer::dataEngine(const QString &name)
+         DataEngine *engine = DataEngineManager::self()->engine(name);
+         if (engine->isValid()) {
+             return engine;
+-        } else {
+-            d->loadedEngines.remove(name);
+         }
+     }
+ 
+     DataEngine *engine = DataEngineManager::self()->loadEngine(name);
+-    if (engine->isValid()) {
+-        d->loadedEngines.insert(name);
+-    }
+-
++    d->loadedEngines.insert(name);
+     return engine;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 363bd31..a01aa28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ portait-prop-is-not-relevant-when-there-is-no-text.patch
 correctly-forward-status-from-applets-to-containment.patch
 it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
 set-default-hints-when-repr-doesn-t-export-Layout.patch
+Ref-deref-DataEngines-even-if-the-metadata-is-invalid.patch

-- 
plasma-framework packaging