rev 14037 - in trunk/packages/kdebase-workspace/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2009-03-11 11:46:30 +0000 (Wed, 11 Mar 2009)
New Revision: 14037

Added:
   trunk/packages/kdebase-workspace/debian/patches/00_r934863_plasma_geometry_crash.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
+++ Changes by Modestas Vainius:
* Backport a patch to fix a nasty crash on plasma startup
(patch 00_r934863_plasma_geometry_crash.diff).

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-03-11 11:00:14 UTC (rev 14036)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-03-11 11:46:30 UTC (rev 14037)
@@ -1,3 +1,12 @@
+kdebase-workspace (4:4.2.1-2) UNRELEASED; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Backport a patch to fix a nasty crash on plasma startup
+    (patch 00_r934863_plasma_geometry_crash.diff).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Mar 2009 13:45:01 +0200
+
 kdebase-workspace (4:4.2.1-1) experimental; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdebase-workspace/debian/patches/00_r934863_plasma_geometry_crash.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/00_r934863_plasma_geometry_crash.diff	                        (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/00_r934863_plasma_geometry_crash.diff	2009-03-11 11:46:30 UTC (rev 14037)
@@ -0,0 +1,25 @@
+--- a/plasma/shells/desktop/panelview.cpp
++++ b/plasma/shells/desktop/panelview.cpp
+@@ -203,6 +203,11 @@
+       m_triggerEntered(false)
+ {
+     Q_ASSERT(qobject_cast<Plasma::Corona*>(panel->scene()));
++
++    m_strutsTimer = new QTimer(this);
++    m_strutsTimer->setSingleShot(true);
++    connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
++
+     if (panel) {
+         connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
+         connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
+@@ -248,10 +253,6 @@
+     KWindowSystem::setOnAllDesktops(winId(), true);
+ 
+     QTimer::singleShot(0, this, SLOT(init()));
+-
+-    m_strutsTimer = new QTimer(this);
+-    m_strutsTimer->setSingleShot(true);
+-    connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts()));
+ }
+ 
+ PanelView::~PanelView()

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2009-03-11 11:00:14 UTC (rev 14036)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2009-03-11 11:46:30 UTC (rev 14037)
@@ -1,3 +1,4 @@
+00_r934863_plasma_geometry_crash.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff