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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/containments/panel
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-06-11 22:42:40
Message-ID: 1244760160.122615.12947.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 980532 by aseigo:

same fixes as done to desktop containment


 M  +26 -2     panel.cpp  


--- trunk/KDE/kdebase/workspace/plasma/containments/panel/panel.cpp #980531:980532
@@ -186,12 +186,36 @@
             }
         }
 
-        m_addPanelAction->setIcon(KIcon("list-add"));
+        if (m_addPanelAction) {
+            m_addPanelAction->setIcon(KIcon("list-add"));
+        }
+
         constraintsEvent(Plasma::ImmutableConstraint);
     }
 
     QList<QAction*> actions;
-    actions << action("add widgets") << m_addPanelAction << action("lock widgets") \
<< m_configureAction << action("remove"); +
+    QAction *a = action("add widgets");
+    if (a) {
+        actions.append(a);
+    }
+
+    if (m_addPanelAction) {
+        actions.append(m_addPanelAction);
+    }
+
+    a = action("lock widgets");
+    if (a) {
+        actions.append(a);
+    }
+
+    actions.append(m_configureAction);
+
+    a = action("remove");
+    if (a) {
+        actions.append(a);
+    }
+
     return actions;
 }
 


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