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

List:       kde-commits
Subject:    KDE/kdebase/workspace/powerdevil
From:       Dario Freddi <drf () kde ! org>
Date:       2009-11-30 11:28:16
Message-ID: 1259580496.857848.4062.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056503 by dafre:

CCMAIL: wstephenson@kde.org
BUG: 199397

Move everything which is not strictly related to first loading to the main loading routine (and \
leverage some load from the bus while we're at it). This should fix the bug in CC and Will, \
this fixes what we discussed on IRC the other day.



 M  +17 -17    daemon/PowerDevilDaemon.cpp  
 M  +1 -10     kcmodule/PowerDevilKCM.cpp  


--- trunk/KDE/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp #1056502:1056503
@@ -381,6 +381,23 @@
     }
 
     Solid::Control::PowerManager::setScheme(settings->readEntry("scheme"));
+
+    // Compositing!!
+
+    if (settings->readEntry("disableCompositing", false)) {
+        if (toggleCompositing(false)) {
+            PowerDevilSettings::setCompositingChanged(true);
+            PowerDevilSettings::self()->writeConfig();
+        }
+    } else if (PowerDevilSettings::compositingChanged()) {
+        toggleCompositing(true);
+        PowerDevilSettings::setCompositingChanged(false);
+        PowerDevilSettings::self()->writeConfig();
+    }
+
+    if (PowerDevilSettings::manageDPMS()) {
+        setUpDPMS();
+    }
 }
 
 void PowerDevilDaemon::setUpDPMS()
@@ -1303,23 +1320,6 @@
     if (!settings->readEntry("scriptpath", QString()).isEmpty()) {
         QProcess::startDetached(settings->readEntry("scriptpath"));
     }
-
-    // Compositing!!
-
-    if (settings->readEntry("disableCompositing", false)) {
-        if (toggleCompositing(false)) {
-            PowerDevilSettings::setCompositingChanged(true);
-            PowerDevilSettings::self()->writeConfig();
-        }
-    } else if (PowerDevilSettings::compositingChanged()) {
-        toggleCompositing(true);
-        PowerDevilSettings::setCompositingChanged(false);
-        PowerDevilSettings::self()->writeConfig();
-    }
-
-    if (PowerDevilSettings::manageDPMS()) {
-        setUpDPMS();
-    }
 }
 
 bool PowerDevilDaemon::toggleCompositing(bool enabled)
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/PowerDevilKCM.cpp #1056502:1056503
@@ -173,16 +173,7 @@
 {
     QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kded", "/modules/powerdevil",
                        "org.kde.PowerDevil", "reloadAndStream");
-    m_dbus.call(msg);
-    msg = QDBusMessage::createMethodCall("org.kde.kded", "/modules/powerdevil",
-                                         "org.kde.PowerDevil", "refreshStatus");
-    m_dbus.call(msg);
-    msg = QDBusMessage::createMethodCall("org.kde.kded", "/modules/powerdevil",
-                                         "org.kde.PowerDevil", "setUpPollingSystem");
-    m_dbus.call(msg);
-    msg = QDBusMessage::createMethodCall("org.kde.kded", "/modules/powerdevil",
-                                         "org.kde.PowerDevil", "refreshStatus");
-    m_dbus.call(msg);
+    m_dbus.asyncCall(msg);
 }
 
 #include "PowerDevilKCM.moc"


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