[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-05-29 17:35:50
Message-ID: 1243618550.423521.652.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 974748 by aseigo:

ensure that the parentGroup() exists before accessing it


 M  +2 -0      abstracttaskitem.cpp  
 M  +3 -5      taskgroupitem.cpp  
 M  +1 -1      windowtaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp #974747:974748
@@ -775,6 +775,7 @@
         m_activateTimer->setInterval(300);
         connect(m_activateTimer, SIGNAL(timeout()), this, SLOT(activate()));
     }
+
     m_activateTimer->start();
 }
 
@@ -978,6 +979,7 @@
         kDebug() <<"no item";
         return false;
     }
+
     return m_abstractItem->isGrouped();
 }
 
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #974747:974748
@@ -288,6 +288,7 @@
             kDebug() << "invalid Item";
             continue;
         }
+
         itemsToRemove.removeAll(item);
         itemAdded(item);
 
@@ -420,8 +421,6 @@
     return item;
 }
 
-
-
 void TaskGroupItem::itemAdded(TaskManager::AbstractItemPtr groupableItem)
 {
     //kDebug();
@@ -465,8 +464,7 @@
 
     TaskGroupItem *group = qobject_cast<TaskGroupItem*>(item);
     if (group) {
-        connect(item, SIGNAL(changed()),
-            this, SLOT(relayoutItems()));
+        connect(item, SIGNAL(changed()), this, SLOT(relayoutItems()));
     }
 }
 
@@ -477,6 +475,7 @@
         kDebug() << "No Applet";
         return;
     }
+
     AbstractTaskItem *item = m_groupMembers.take(groupableItem);;
 
     if (!item) {
@@ -495,7 +494,6 @@
     item->deleteLater();
 }
 
-
 bool TaskGroupItem::isWindowItem() const
 {
     return false;
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/windowtaskitem.cpp #974747:974748
@@ -89,7 +89,7 @@
 void WindowTaskItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->buttons() & Qt::MidButton) {
-        if (isGrouped()) {
+        if (isGrouped() && parentGroup()) {
             parentGroup()->collapse();
         }
     } else {

[prev in list] [next in list] [prev in thread] [next in thread]