rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.2-kde#187699.patch, NONE, 1.1 kdebase-workspace.spec, 1.169, 1.170

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
Log Message:
* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)


kdebase-workspace-4.2.2-kde#187699.patch:

--- NEW FILE kdebase-workspace-4.2.2-kde#187699.patch ---
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
@@ -45,12 +45,9 @@
          */
         QGraphicsWidget *graphicsWidget();
 
-    protected:
-        void updateDate();
-        void timerEvent(QTimerEvent *event);
-
     protected slots:
         void configAccepted();
+        void updateDate();
 
     private:
         void paintIcon();
@@ -58,7 +55,6 @@
         Plasma::Calendar *m_calendarDialog;
         Plasma::Svg *m_theme;
         int m_date;
-        int m_updateTimerId;
 };
 
 K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
@@ -19,6 +19,7 @@
 
 #include <QGraphicsLayout>
 #include <QPainter>
+#include <QTimer>
 
 #include <KDebug>
 #include <KIcon>
@@ -35,7 +36,6 @@
     m_calendarDialog(0),
     m_theme(0),
     m_date(0),
-    m_updateTimerId(0)
 {
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
     setCacheMode(DeviceCoordinateCache);
@@ -116,18 +116,9 @@
     QDateTime d = QDateTime::currentDateTime();
     m_date = d.date().day();
     int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
-    m_updateTimerId = startTimer(updateIn * 1000);
+    QTimer::singleShot(updateIn * 1000, this, SLOT(updateDate()));
     constraintsEvent(Plasma::FormFactorConstraint);
 }
 
-void CalendarTest::timerEvent(QTimerEvent *event)
-{
-    if (event->timerId() != m_updateTimerId) {
-        return;
-    }
-
-    killTimer(m_updateTimerId);
-    updateDate();
-}
 
 #include "calendar.moc"


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdebase-workspace.spec	1 Apr 2009 23:08:30 -0000	1.169
+++ kdebase-workspace.spec	12 Apr 2009 19:00:37 -0000	1.170
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.2
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -44,6 +44,8 @@
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
 #Â 4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
+# http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
+Patch106: kdebase-workspace-4.2.2-kde#187699.patch
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -239,6 +241,8 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
+%patch106 -p5 -b .kde#187699
+
 
 %build
 
@@ -510,6 +514,9 @@
 
 
 %changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- Calendar standalone plasmoid on Desktop using 100% of CPU (kde#187699)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 - drop upstreamed patches