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

List:       kde-commits
Subject:    playground/base/plasma
From:       Alexis Ménard <menard () kde ! org>
Date:       2010-06-23 13:47:45
Message-ID: 20100623134745.75DA6AC8E1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1141785 by menard:

This is broken code. The wallpapers work properly now.

 M  +1 -1      applets/CMakeLists.txt  
 M  +0 -12     shells/mobile/shell/plasmaapp.cpp  


--- trunk/playground/base/plasma/applets/CMakeLists.txt #1141784:1141785
@@ -123,7 +123,7 @@
 macro_optional_add_subdirectory(timeline)
 macro_optional_add_subdirectory(killswitch)
 macro_optional_add_subdirectory(discburner)
-macro_optional_add_subdirectory(kopete_extender)
+#macro_optional_add_subdirectory(kopete_extender)
 macro_optional_add_subdirectory(pgame)
 #macro_optional_add_subdirectory(screen_control)
 macro_optional_add_subdirectory(webwatcher)
--- trunk/playground/base/plasma/shells/mobile/shell/plasmaapp.cpp #1141784:1141785
@@ -379,18 +379,6 @@
     containment->setGraphicsEffect(effect);
     containment->graphicsEffect()->setEnabled(false);
 
-    //We load the wallpaper now so when animating the containments around the first \
                time it will not be slow
-    Plasma::Wallpaper *w = containment->wallpaper();
-    if (!w->isInitialized()) {
-        // delayed paper initialization
-        KConfigGroup wallpaperConfig = containment->config();
-        wallpaperConfig = KConfigGroup(&wallpaperConfig, "Wallpaper");
-        wallpaperConfig = KConfigGroup(&wallpaperConfig, w->pluginName());
-        w->restore(wallpaperConfig);
-        disconnect(w, SIGNAL(update(const QRectF&)), containment, \
                SLOT(updateRect(const QRectF&)));
-        connect(w, SIGNAL(update(const QRectF&)), containment, SLOT(updateRect(const \
                QRectF&)));
-    }
-
     m_mainSlot->setFlag(QGraphicsItem::ItemHasNoContents, false);
     containment->resize(m_mainView->size());
 


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