Control: tags -1 + patch Hi
Submit tested patch.
Regards
Stefan Lippers-Hollmann
From dd8a6fab3e1a918e7afdf5a4d6657648ef3d15f2 Mon Sep 17 00:00:00 2001
From: Stefan Lippers-Hollmann <s....@gmx.de>
Date: Wed, 29 Aug 2012 00:35:18 +0200
Subject: [PATCH] cherry-pick upstream 70cd86a5eef103137e64f2e3868a5bd2d58d71d7
Backport upstream commit 70cd86a5eef103137e64f2e3868a5bd2d58d71d7 to fix
deletion of preferred application launchers:
patch upstream_fix_deletion_of_preferred_application_launchers.patch
(Closes: #686131).
Signed-off-by: Stefan Lippers-Hollmann <s....@gmx.de>
---
debian/changelog | 6 +++
debian/patches/series | 1 +
...letion_of_preferred_application_launchers.patch | 46 ++++++++++++++++++++
3 files changed, 53 insertions(+)
create mode 100644 debian/patches/upstream_fix_deletion_of_preferred_application_launchers.patch
diff --git a/debian/changelog b/debian/changelog
index ba7eb1e..2311af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ kde-workspace (4:4.8.4-4) UNRELEASED; urgency=low
* Add breaks/replaces in kde-window-manager against kdebase-workspace-data
<< 4.7.2. (Closes: #684972)
+ [ Stefan Lippers-Hollmann ]
+ * Backport upstream commit 70cd86a5eef103137e64f2e3868a5bd2d58d71d7 to fix
+ deletion of preferred application launchers:
+ patch upstream_fix_deletion_of_preferred_application_launchers.patch
+ (Closes: #686131).
+
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 15 Aug 2012 11:34:25 +0200
kde-workspace (4:4.8.4-3) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 3f54d79..16dcfdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ relax_kdelibs_dependency.diff
hurd.diff
upstream_make-sure-scripts-are-executed-sorted.patch
upstream_centralize-interaction-notification-handling.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..ae296a9
--- /dev/null
+++ b/debian/patches/upstream_fix_deletion_of_preferred_application_launchers.patch
@@ -0,0 +1,46 @@
+From: Gregor Tätzner <gre...@freenet.de>
+Date: Thu, 26 Jul 2012 12:32:38 +0000
+Subject: Fix deletion of preferred application launchers
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=70cd86a5eef103137e64f2e3868a5bd2d58d71d7
+---
+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
+---
+
+
+--- a/libs/taskmanager/groupmanager.cpp
++++ b/libs/taskmanager/groupmanager.cpp
+@@ -1070,8 +1070,16 @@ void GroupManagerPrivate::unsaveLauncher
+ 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(c
+ foreach (const LauncherItem * item, launchers) {
+ if (item->launcherUrl() == url) {
+ return index;
+- }
++ }
+
+ ++index;
+ }
--
1.7.10.4
signature.asc
Description: This is a digitally signed message part.
