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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/wallpapers/image
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2010-07-31 20:43:37
Message-ID: 20100731204337.DC31BAC7BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157677 by wstephens:

Fix bug where dropping an image file on the desktop when the Image wallpaper
plugin is not in use causes Image to start up in Slideshow mode.  This is
because Containment tries to set the default rendering mode using an empty
string, whereas Image's logic falls through to Slideshow if the mode is empty.

Treat empty rendering mode name as SingleImage.  A proper fix would be
to discover the default rendering mode in
Plasma::Wallpaper::setRenderingMode().  This would avoid an empty mode
string in the config file.


 M  +6 -0      image.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/wallpapers/image/image.cpp #1157676:1157677
@@ -62,7 +62,13 @@
 void Image::init(const KConfigGroup &config)
 {
     m_timer.stop();
+
+    if (renderingMode().name().isEmpty()) {
+        m_mode = "SingleImage";
+    } else {
     m_mode = renderingMode().name();
+    }
+
     calculateGeometry();
 
     m_delay = config.readEntry("slideTimer", 10);
[prev in list] [next in list] [prev in thread] [next in thread]