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

List:       kde-commits
Subject:    branches/KDE/4.3/kdebase/workspace/plasma/wallpapers/image
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-11-03 21:09:54
Message-ID: 1257282594.424243.29147.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1044473 by aseigo:

slightly improved and backported fix for:
CCBUG:212913


 M  +3 -6      image.cpp  


--- branches/KDE/4.3/kdebase/workspace/plasma/wallpapers/image/image.cpp \
#1044472:1044473 @@ -43,6 +43,7 @@
       m_randomize(true),
       m_startupResumed(false)
 {
+    suspendStartup(true); // during KDE startup, make ksmserver until the wallpaper \
                is ready  
     connect(this, SIGNAL(renderCompleted(QImage)), this, \
SLOT(updateBackground(QImage)));  connect(&m_timer, SIGNAL(timeout()), this, \
SLOT(nextSlide()));  }
@@ -53,8 +54,6 @@
 
 void Image::init(const KConfigGroup &config)
 {
-    suspendStartup(true); // during KDE startup, make ksmserver until the wallpaper \
                is ready  
-    
     m_timer.stop();
     m_mode = renderingMode().name();
     calculateGeometry();
@@ -243,6 +242,8 @@
         return;
     }
 
+    suspendStartup(false);
+
     if (painter->worldMatrix() == QMatrix()) {
         // draw the background untransformed when possible;(saves lots of \
per-pixel-math)  painter->resetTransform();
@@ -591,10 +592,6 @@
     m_oldFadedPixmap = m_oldPixmap;
     m_pixmap = QPixmap::fromImage(img);
 
-    if(!img.isNull()){
-        suspendStartup(false);
-    }
-    
     if (!m_oldPixmap.isNull()) {
         Plasma::Animator::self()->customAnimation(254, 1000, \
Plasma::Animator::EaseInCurve, this, "updateFadedImage");  } else {


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