[SCM] KDE Base Workspace module packaging branch, wheezy, updated. debian/4.8.4-4-10-gcd7fbd2

[Pino Toscano]

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

The following commit has been merged in the wheezy branch:
commit cd7fbd21bc4d47111ad0d45ba73f718ee6740a28
Author: Pino Toscano <pino at debian.org>
Date:   Mon Nov 5 11:48:41 2012 +0100

    fix deletion of launchers of preferred applications (#686131)
    
    backport upstream commit 70cd86a5eef103137e64f2e3868a5bd2d58d71d7
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...letion-of-preferred-application-launchers.patch |   50 ++++++++++++++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f0023ac..02580ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
     improve the sorting of init .js files (followup of the changes backported
     in 4:4.8.4-3 with upstream_make-sure-scripts-are-executed-sorted.patch);
     patch upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch.
+  * Backport upstream commit 70cd86a5eef103137e64f2e3868a5bd2d58d71d7 to fix
+    the deletion of launchers of preferred applications; patch
+    upstream_Fix-deletion-of-preferred-application-launchers.patch.
+    (Closes: #686131)
 
   [ Debconf translation updates ]
   * Fix encoding of Polish (thanks to David Prévot). (Closes: #691953)
diff --git a/debian/patches/series b/debian/patches/series
index fb509f1..6e2c47b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch
 upstream_Use-cascaded-configs-for-other-modules-as-well.patch
 upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch
 upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch
+upstream_Fix-deletion-of-preferred-application-launchers.patch
diff --git a/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch b/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch
new file mode 100644
index 0000000..d8fb6f6
--- /dev/null
+++ b/debian/patches/upstream_Fix-deletion-of-preferred-application-launchers.patch
@@ -0,0 +1,50 @@
+From 70cd86a5eef103137e64f2e3868a5bd2d58d71d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gregor=20T=C3=A4tzner?= <gregor at freenet.de>
+Date: Thu, 26 Jul 2012 14:32:38 +0200
+Subject: [PATCH] Fix deletion of preferred application launchers
+
+In default panel config the host of that magic preferred app url is used
+as the key. So lets use that key to delete the launchers, too.
+
+BUG: 278724
+FIXED-IN: 4.9.1
+REVIEW: 105374
+---
+ libs/taskmanager/groupmanager.cpp |   14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp
+index 5ca0159..45c15a9 100644
+--- a/libs/taskmanager/groupmanager.cpp
++++ b/libs/taskmanager/groupmanager.cpp
+@@ -1070,8 +1070,16 @@ void GroupManagerPrivate::unsaveLauncher(LauncherItem *launcher)
+         return;
+     }
+ 
+-    if (cg.hasKey(launcher->name())) {
+-        cg.deleteEntry(launcher->name());
++    QString launcherKey;
++
++    if (launcher->launcherUrl().protocol() == "preferred")
++        // in default config the host of the preferred application url is used as key
++        launcherKey = launcher->launcherUrl().host();
++    else
++        launcherKey = launcher->name();
++
++    if (cg.hasKey(launcherKey)) {
++        cg.deleteEntry(launcherKey);
+         emit q->configChanged();
+     }
+ }
+@@ -1127,7 +1135,7 @@ int GroupManagerPrivate::launcherIndex(const KUrl &url)
+     foreach (const LauncherItem * item, launchers) {
+         if (item->launcherUrl() == url) {
+             return index;
+-        } 
++        }
+ 
+         ++index;
+     }
+-- 
+1.7.10.4
+

-- 
KDE Base Workspace module packaging