File bko264730-powerdevil-dpms-for-4.6.0.diff of Package python-kdebase4

Overview Repositories Revisions Requests Users Attributes Meta

File bko264730-powerdevil-dpms-for-4.6.0.diff of Package python-kdebase4 (Revision 9ff70e3d92f8fd396252c3f179456a0c)

Currently displaying revision 9ff70e3d92f8fd396252c3f179456a0c , Show latest

commit c514910cef68c614286be7135e0d22d9226dacfa
Author: Dario Freddi <drf@kde.org>
Date:   Sun Jan 30 15:00:01 2011 +0100

Add a new method to ActionPool, init(), to load on startup actions which require instant load.
    
    Some actions, such as DPMS, require to be initialized even if no profile explicitly asked for the action itself,
    as it might be necessary to perform some changes when the action is disabled.
    
    CCBUG: 264730
    FIXED-IN: 4.6.1
    
    (cherry picked from commit 5dd9f08b1849800989778d4ca82f91b6977acfff)

diff --git a/powerdevil/daemon/powerdevilactionpool.cpp b/powerdevil/daemon/powerdevilactionpool.cpp
index 9b967a3..fea1863 100644
--- a/powerdevil/daemon/powerdevilactionpool.cpp
+++ b/powerdevil/daemon/powerdevilactionpool.cpp
@@ -73,6 +73,33 @@ ActionPool::~ActionPool()
     m_cachedPool.clear();
 }
 
+void ActionPool::init(PowerDevil::Core *parent)
+{
+    // We want to load action which require the loading phase to be performed before anything else
+    // No bundled actions require that (yet)
+
+    // Look for actions not bundled and requiring instant load
+    KService::List offers = KServiceTypeTrader::self()->query("PowerDevil/Action",
+                                                              "[X-KDE-PowerDevil-Action-IsBundled] == FALSE and "
+                                                              "[X-KDE-PowerDevil-Action-ForceInstantLoad] == TRUE");
+    foreach (KService::Ptr offer, offers) {
+        QString actionId = offer->property("X-KDE-PowerDevil-Action-ID", QVariant::String).toString();
+
+        kDebug() << "Got a valid offer for " << actionId;
+        //try to load the specified library
+        PowerDevil::Action *retaction = offer->createInstance< PowerDevil::Action >(parent);
+
+        if (!retaction) {
+            // Troubles...
+            kWarning() << "failed to load" << offer->desktopEntryName();
+            continue;
+        }
+
+        // Cache
+        m_cachedPool.insert(actionId, retaction);
+    }
+}
+
 Action* ActionPool::loadAction(const QString& actionId, const KConfigGroup& group, PowerDevil::Core *parent)
 {
     // If it's cached, easy game.
diff --git a/powerdevil/daemon/powerdevilactionpool.h b/powerdevil/daemon/powerdevilactionpool.h
index 862d867..a471d4f 100644
--- a/powerdevil/daemon/powerdevilactionpool.h
+++ b/powerdevil/daemon/powerdevilactionpool.h
@@ -38,6 +38,8 @@ public:
 
     virtual ~ActionPool();
 
+    void init(PowerDevil::Core *parent);
+
     Action *loadAction(const QString &actionId, const KConfigGroup &group, PowerDevil::Core *parent);
 
     void unloadAllActiveActions();
diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp
index 19ebc03..df14f77 100644
--- a/powerdevil/daemon/powerdevilcore.cpp
+++ b/powerdevil/daemon/powerdevilcore.cpp
@@ -131,6 +131,9 @@ void Core::onBackendReady()
     // Set up the policy agent
     PowerDevil::PolicyAgent::instance()->init();
 
+    // Initialize the action pool, which will also load the needed startup actions.
+    PowerDevil::ActionPool::instance()->init(this);
+
     // Set up the critical battery timer
     m_criticalBatteryTimer->setSingleShot(true);
     m_criticalBatteryTimer->setInterval(30000);
commit 397684cbf750b63a3a84a65e0eb1a44a22a483f0
Author: Dario Freddi <drf@kde.org>
Date:   Sun Jan 30 14:55:53 2011 +0100

Move DPMS handling in the constructor.
    
    This makes more sense as
    
    1. With the previous approach, DPMS support was queried everytime a profile changed, now it is queried on startup only.
    2. It allows to disable DPMS on startup even if a profile has not loaded the action yet.
    
    (cherry picked from commit 8db343c4b8c511b6d85dbe0ffebc039280836280)

diff --git a/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp b/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp
index fe5b266..0a1f5b4 100644
--- a/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp
+++ b/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp
@@ -67,9 +67,25 @@ K_EXPORT_PLUGIN(PowerDevilDPMSActionFactory("powerdevildpmsaction"))
 
 PowerDevilDPMSAction::PowerDevilDPMSAction(QObject* parent, const QVariantList& )
     : Action(parent)
+    , m_hasDPMS(true)
     , d(new Private)
 {
     setRequiredPolicies(PowerDevil::PolicyAgent::ChangeScreenSettings);
+
+    // We want to query for DPMS in the constructor, before anything else happens
+    d->defaultHandler = XSetErrorHandler(dropError);
+
+    Display *dpy = QX11Info::display();
+
+    int dummy;
+
+    if (!DPMSQueryExtension(dpy, &dummy, &dummy) || !DPMSCapable(dpy)) {
+        m_hasDPMS = false;
+        XSetErrorHandler(d->defaultHandler);
+    }
+
+    // Pretend we're unloading profiles here, as if the action is not enabled, DPMS should be switched off.
+    onProfileUnload();
 }
 
 PowerDevilDPMSAction::~PowerDevilDPMSAction()
@@ -149,23 +165,7 @@ void PowerDevilDPMSAction::triggerImpl(const QVariantMap& args)
 
 bool PowerDevilDPMSAction::loadAction(const KConfigGroup& config)
 {
-    d->defaultHandler = XSetErrorHandler(dropError);
-
-    Display *dpy = QX11Info::display();
-
-    int dummy;
-    m_hasDPMS = true;
-
-    if (!DPMSQueryExtension(dpy, &dummy, &dummy) || !DPMSCapable(dpy)) {
-        m_hasDPMS = false;
-        XSetErrorHandler(d->defaultHandler);
-    }
-
-    if (config.hasKey("idleTime")) {
-        m_idleTime = config.readEntry<int>("idleTime", 100000000);
-    } else {
-        m_hasDPMS = false;
-    }
+    m_idleTime = config.readEntry<int>("idleTime", -1);
 
     return true;
 }

Places

File bko264730-powerdevil-dpms-for-4.6.0.diff of Package python-kdebase4 (Revision 9ff70e3d92f8fd396252c3f179456a0c)

Places