| 1 |
dilfridge 11/11/29 21:49:08 |
| 2 |
|
| 3 |
Added: plasma-workspace-4.7.3-deletedwidget.patch |
| 4 |
Log: |
| 5 |
Another crash fix, bug 389991 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.37/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: plasma-workspace-4.7.3-deletedwidget.patch |
| 16 |
=================================================================== |
| 17 |
commit 2d1deb4234aa3d43e2a7cc48fc1f6936bd2ff97c |
| 18 |
Author: Aaron Seigo <aseigo@×××.org> |
| 19 |
Date: Wed Nov 9 17:11:50 2011 +0100 |
| 20 |
|
| 21 |
since the widget is being deleted, remove it from the collection |
| 22 |
|
| 23 |
BUG:286197 |
| 24 |
BUG:286195 |
| 25 |
BUG:264750 |
| 26 |
BUG:277367 |
| 27 |
BUG:280326 |
| 28 |
BUG:280072 |
| 29 |
BUG:282552 |
| 30 |
BUG:283061 |
| 31 |
BUG:284603 |
| 32 |
BUG:286177 |
| 33 |
BUG:286181 |
| 34 |
|
| 35 |
diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/generic/applets/systemtray/core/task.cpp |
| 36 |
index 5793102..1a02c24 100644 |
| 37 |
--- a/plasma/generic/applets/systemtray/core/task.cpp |
| 38 |
+++ b/plasma/generic/applets/systemtray/core/task.cpp |
| 39 |
@@ -101,7 +101,7 @@ QHash<Plasma::Applet *, QGraphicsWidget *> Task::widgetsByHost() const |
| 40 |
|
| 41 |
void Task::abandon(Plasma::Applet *host) |
| 42 |
{ |
| 43 |
- QGraphicsWidget *widget = d->widgetsByHost.value(host); |
| 44 |
+ QGraphicsWidget *widget = d->widgetsByHost.take(host); |
| 45 |
if (widget) { |
| 46 |
widget->deleteLater(); |
| 47 |
} |
| 48 |
@@ -116,7 +116,7 @@ void Task::widgetDeleted() |
| 49 |
{ |
| 50 |
bool wasEmbeddable = isEmbeddable(); |
| 51 |
|
| 52 |
- QGraphicsWidget * w = static_cast<QGraphicsWidget*>(sender()); |
| 53 |
+ QGraphicsWidget *w = static_cast<QGraphicsWidget*>(sender()); |
| 54 |
QMutableHashIterator<Plasma::Applet *, QGraphicsWidget *> it(d->widgetsByHost); |
| 55 |
while (it.hasNext()) { |
| 56 |
it.next(); |
Archives