rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.1-kde#185736.patch, NONE, 1.1 kdebase-workspace.spec, 1.138, 1.139

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31565

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.1-kde#185736.patch 
Log Message:
* Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-4
- kde 4.2 update crashes plasma (kdebug#185736)


kdebase-workspace-4.2.1-kde#185736.patch:

--- NEW FILE kdebase-workspace-4.2.1-kde#185736.patch ---
--- branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/02/24 04:51:03	930724
+++ branches/KDE/4.2/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/03/03 23:39:55	934863
@@ -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()


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- kdebase-workspace.spec	5 Mar 2009 01:32:15 -0000	1.138
+++ kdebase-workspace.spec	9 Mar 2009 15:25:02 -0000	1.139
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.1
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -42,6 +42,8 @@
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 # from 4.3: http://bugs.kde.org/180576
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
+# 4.2 , http://bugs.kde.org/185736
+Patch104: kdebase-workspace-4.2.1-kde#185736.patch
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
@@ -222,6 +224,8 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
+%patch104 -p5 -b .kde#185736
+
 
 %build
 
@@ -370,6 +374,9 @@
 
 
 %changelog
+* Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-4
+- kde 4.2 update crashes plasma (kdebug#185736)
+
 * Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
 - move designer plugins to main/runtime (#487622)