[SCM] plasma-workspace packaging branch, master, updated. debian/5.4.1-1-7-gd33a60c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=9f28b5c

The following commit has been merged in the master branch:
commit 9f28b5c3e3a981ae581600a471c11601be32db13
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Oct 2 18:31:36 2015 +0200

    Drop upstream applied patch: plasmoid_creation_fix_null_check.patch
---
 debian/changelog                                   |  1 +
 .../patches/plasmoid_creation_fix_null_check.patch | 36 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb55167..2f4492f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ plasma-workspace (4:5.4.2-1~) UNRELEASED; urgency=medium
   * Add missing provides notification-daemon. (Closes: #798377) Thanks
     to Zhang Jingqiang.
   * New upstream release (5.4.2).
+  * Drop upstream applied patch: plasmoid_creation_fix_null_check.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 01 Oct 2015 17:14:39 +0200
 
diff --git a/debian/patches/plasmoid_creation_fix_null_check.patch b/debian/patches/plasmoid_creation_fix_null_check.patch
deleted file mode 100644
index e3badd0..0000000
--- a/debian/patches/plasmoid_creation_fix_null_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix: dereference-before-null-check
- The instance m_applet was dereferenced (which can be NULL if loadApplet fails)
- a few lines before a NULL check to m_applet is done. Moving the NULL check before
- the dereference to avoid crashing plasmashell.
-Author: Michael Musenbrock <redeamer at gmx.net>
-Bug-Debian: http://bugs.debian.org/792875
-
---- plasma-workspace-5.3.2.orig/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
-+++ plasma-workspace-5.3.2/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
-@@ -52,6 +52,13 @@ PlasmoidTask::PlasmoidTask(const QString
-     qCDebug(SYSTEMTRAY) << "Loading applet: " << packageName << appletId;
- 
-     m_applet = Plasma::PluginLoader::self()->loadApplet(packageName, appletId);
-+
-+    if (!m_applet) {
-+        qCDebug(SYSTEMTRAY) << "Invalid applet taskitem";
-+        m_valid = false;
-+        return;
-+    }
-+
-     cont->setImmutability(Plasma::Types::Mutable);
-     cont->addApplet(m_applet);
-     m_applet->setParent(cont);
-@@ -81,12 +88,6 @@ PlasmoidTask::PlasmoidTask(const QString
-     }
- 
- 
--
--    if (!m_applet) {
--        qCDebug(SYSTEMTRAY) << "Invalid applet taskitem";
--        m_valid = false;
--        return;
--    }
-     connect(m_applet, &Plasma::Applet::statusChanged, this, &PlasmoidTask::updateStatus);
- 
-     if (pluginInfo().isValid()) {
diff --git a/debian/patches/series b/debian/patches/series
index 89ab040..fed1404 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_startkde-qtpath.diff
 install_missing_header
-plasmoid_creation_fix_null_check.patch
 disable_incompatible_tests

-- 
plasma-workspace packaging