commit plasma-addons for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at 2013-09-11 13:04:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-addons (Old) and /work/SRC/openSUSE:Factory/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-addons" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-addons/plasma-addons.changes 2013-09-09 11:06:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-addons.new/plasma-addons.changes 2013-09-11 13:04:46.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 9 21:21:25 UTC 2013 - hrvoje.senjan@gmail.com + +- Added 0001-Spin-the-event-loop-before-destroying-the-menu.patch + for resolving kde#324661 (not able to (un)mark launchers with + Icon-Only task manager) + +------------------------------------------------------------------- New: ---- 0001-Spin-the-event-loop-before-destroying-the-menu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.ppE42z/_old 2013-09-11 13:04:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ppE42z/_new 2013-09-11 13:04:47.000000000 +0200 @@ -28,6 +28,8 @@ Patch1: krunner-akonadi-dont-cause-start.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: lancelot-suse.diff +# PATCH-FIX-UPSTREAM 0001-Spin-the-event-loop-before-destroying-the-menu.patch -- kde#324661 +Patch100: 0001-Spin-the-event-loop-before-destroying-the-menu.patch BuildRequires: fdupes BuildRequires: ibus-devel BuildRequires: kdebase4-workspace-devel @@ -118,6 +120,7 @@ %setup -q -n kdeplasma-addons-%{version} %patch1 %patch2 +%patch100 -p1 %build %cmake_kde4 -d build ++++++ 0001-Spin-the-event-loop-before-destroying-the-menu.patch ++++++
From 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6 Mon Sep 17 00:00:00 2001 From: Eike Hein
Date: Mon, 9 Sep 2013 23:12:45 +0200 Subject: [PATCH 1/1] Spin the event loop before destroying the menu.
This allows the menu implementation to complete toggling the
launcher before the instance is destroyed. It's extremely un-
fortunate that the library currently requires this careful
handling; see e944d7ae in kde-workspace for a note on what
needs to be cleaned up there.
BUG:324661
---
applets/icontasks/windowtaskitem.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp
index b5f646c..f721b5a 100644
--- a/applets/icontasks/applauncheritem.cpp
+++ b/applets/icontasks/applauncheritem.cpp
@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
actionList.append(configAction);
}
- TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
- menu.adjustSize();
+ TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
+ menu->adjustSize();
if (m_applet->formFactor() != Plasma::Vertical) {
- menu.setMinimumWidth(size().width());
+ menu->setMinimumWidth(size().width());
}
Q_ASSERT(m_applet->containment());
Q_ASSERT(m_applet->containment()->corona());
stopWindowHoverEffect();
- menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
+ menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size()));
+ menu->deleteLater();
}
diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp
index 970c19f..61b39ef 100644
--- a/applets/icontasks/windowtaskitem.cpp
+++ b/applets/icontasks/windowtaskitem.cpp
@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu)
actionList.append(configAction);
}
- TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList
participants (1)
-
root@hilbert.suse.de