Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-08-04 09:17:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2012-07-02 10:59:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-08-04 09:17:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 02:48:47 UTC 2012 - [email protected] + +- Apply to upstream to fix deletion of preferred launchers (bnc#757370, kde#278724) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes 2012-06-12 21:42:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/python-kdebase4.changes 2012-08-04 09:17:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 02:49:02 UTC 2012 - [email protected] + +- Apply to upstream to fix deletion of preferred launchers (bnc#757370, kde#278724) + +------------------------------------------------------------------- New: ---- plasma-fix-delete-preferred-launchers.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.j4c8QT/_old 2012-08-04 09:18:51.000000000 +0200 +++ /var/tmp/diff_new_pack.j4c8QT/_new 2012-08-04 09:18:51.000000000 +0200 @@ -117,7 +117,8 @@ Patch400: kdm_plymouth.patch # PATCH-FIX-OPENSUSE opensuse-homepage.diff Patch401: opensuse-homepage.diff - +# PATCH-FIX-UPSTREAM plasma-fix-delete-preferred-launchers.diff kde#278724 +Patch402: plasma-fix-delete-preferred-launchers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 Requires: %{name}-branding = %{version} @@ -342,6 +343,7 @@ %endif %patch400 -p0 %patch401 -p1 +%patch402 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ plasma-fix-delete-preferred-launchers.diff ++++++ commit f8eb85a87846e49b10dae8170695533262011ae1 Author: Gregor Tätzner <[email protected]> Date: Thu Jul 26 14:32:38 2012 +0200 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 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; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
