rpms/kdebase-workspace/devel kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch, NONE, 1.1 kdebase-workspace.spec, 1.247, 1.248

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21375

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch 
Log Message:
plasma-desktop crashes when closing/opening windows (upstream patch)


kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch:

--- NEW FILE kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch ---
diff -up kdebase-workspace-4.2.95/libs/taskmanager/abstractgroupingstrategy.cpp.orig kdebase-workspace-4.2.95/libs/taskmanager/abstractgroupingstrategy.cpp
--- kdebase-workspace-4.2.95/libs/taskmanager/abstractgroupingstrategy.cpp.orig	2009-07-04 23:41:28.000000000 +0200
+++ kdebase-workspace-4.2.95/libs/taskmanager/abstractgroupingstrategy.cpp	2009-07-04 23:42:39.000000000 +0200
@@ -164,6 +164,10 @@ void AbstractGroupingStrategy::closeGrou
         foreach (AbstractGroupableItem *item, group->members()) {
             parentGroup->add(item);
             //move item to the location where its group was
+            if (!d->groupManager) {
+                // this means that the above add() caused a change in grouping strategy
+                break;
+            }
             d->groupManager->manualSortingRequest(item, index); //move items to position of group
         }
 
Index: workspace/libs/taskmanager/abstractgroupingstrategy.cpp
===================================================================
--- workspace/libs/taskmanager/abstractgroupingstrategy.cpp	(Revision 990719)
+++ workspace/libs/taskmanager/abstractgroupingstrategy.cpp	(Revision 990720)
@@ -82,6 +82,9 @@
         }
 
         parentGroup->remove(group);
+    }
+
+    foreach (TaskGroup *group, d->createdGroups) {
         emit groupRemoved(group);
     }
 
Index: workspace/libs/taskmanager/abstractgroupableitem.cpp
===================================================================
--- workspace/libs/taskmanager/abstractgroupableitem.cpp	(Revision 990719)
+++ workspace/libs/taskmanager/abstractgroupableitem.cpp	(Revision 990720)
@@ -23,13 +23,13 @@
 
 // Ownm_preferredInsertIndex
 #include "abstractgroupableitem.h"
-#include "taskgroup.h"
-#include "taskmanager.h"
 
+#include <QPointer>
 
-// KDE
 #include <KDebug>
 
+#include "taskgroup.h"
+#include "taskmanager.h"
 
 
 namespace TaskManager
@@ -40,11 +40,11 @@
 {
 public:
     Private()
-        :m_parentGroup(0)
+        : m_parentGroup(0)
     {
     }
 
-    GroupPtr m_parentGroup;
+    QPointer<TaskGroup> m_parentGroup;
 };
 
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- kdebase-workspace.spec	3 Jul 2009 10:12:31 -0000	1.247
+++ kdebase-workspace.spec	6 Jul 2009 09:16:30 -0000	1.248
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.95
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -35,6 +35,9 @@ Patch16: kdebase-workspace-4.2.95-libxkl
 # fix the internal version number in CMakeLists.txt so the CMake files get
 # installed to the expected location, otherwise our file list breaks
 Patch100: kdebase-workspace-4.2.95-fix-version.patch
+# plasma-desktop crashes when closing/opening windows
+Patch101: kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch
+
 # trunk
 
 Obsoletes: PolicyKit-kde < %{version}-100 
@@ -232,7 +235,7 @@ Requires: PyKDE4 >= %{version}
 
 # upstream patches
 %patch100 -p0 -b .fix-version
-
+%patch101 -p1 -b .plasma-crash
 
 %build
 
@@ -516,6 +519,9 @@ fi
 
 
 %changelog
+* Mon Jul 06 2009 Than Ngo <than at redhat.com> - 4.2.95-7
+- plasma-desktop crashes when closing/opening windows (upstream patch)
+
 * Fri Jul 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-6
 - add kde-plasma-networkmanagement to the default panel if installed