[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:       2010-10-21 11:22:35
Message-ID: 20101021112235.56B1DAC89D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188084 by dafre:

Fix plugin loading

 M  +1 -1      daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop  
 M  +1 -1      daemon/actions/bundled/powerdevildimdisplayaction.desktop  
 M  +1 -1      daemon/actions/bundled/powerdevildisabledesktopeffectsaction.desktop  
 M  +1 -1      daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop  
 M  +1 -1      daemon/actions/bundled/powerdevilrunscriptaction.desktop  
 M  +1 -1      daemon/actions/bundled/powerdevilsuspendsessionaction.desktop  
 M  +1 -1      daemon/actions/dpms/powerdevildpmsaction.desktop  
 M  +6 -2      daemon/powerdevilactionpool.cpp  
 M  +1 -1      kcmodule/EditPage.cpp  


--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 X-KDE-Library=powerdevilbrightnesscontrolaction_config
 Icon=preferences-system-power-management
 Name=Display Brightness
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 # X-KDE-Library=powerdevildimdisplayaction
 Icon=preferences-desktop-display
 Name=Dim Display
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevildisabledesktopeffectsaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 # X-KDE-Library=powerdevildisabledesktopeffectsaction
 Icon=preferences-desktop-screensaver
 Name=Disable Desktop Effects
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 # X-KDE-Library=powerdevilhandlebuttoneventsaction
 Icon=system-suspend
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilrunscriptaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 # X-KDE-Library=powerdevilrunscriptaction
 Icon=system-run
 Name=Run Script
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilsuspendsessionaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 # X-KDE-Library=powerdevilsuspendsessionaction
 Icon=system-shutdown
 Name=Suspend Session
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/dpms/powerdevildpmsaction.desktop \
#1188083:1188084 @@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-X-KDE-ServiceTypes=PowerDevilAction
+X-KDE-ServiceTypes=PowerDevil/Action
 X-KDE-Library=powerdevildpmsaction
 Icon=preferences-desktop-screensaver
 Name=Screen Energy Saving
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilactionpool.cpp \
#1188083:1188084 @@ -115,9 +115,13 @@
     }
 
     // Otherwise, ask KService for the action itself
-    KService::List offers = KServiceTypeTrader::self()->query("PowerDevil/Action",
-                                                              \
"(X-KDE-PowerDevil-Action-ID == '"+actionId+"')"); +    KService::List offers = \
KServiceTypeTrader::self()->query("PowerDevil/Action");  foreach (KService::Ptr \
offer, offers) { +        if (offer->property("X-KDE-PowerDevil-Action-ID", \
QVariant::String).toString() != actionId) { +            continue;
+        }
+
+        kDebug() << "Got a valid offer for " << actionId;
         //try to load the specified library
         retaction = offer->createInstance< PowerDevil::Action >(parent);
 
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/EditPage.cpp #1188083:1188084
@@ -126,7 +126,7 @@
     QMap< int, QList<QPair<QString, QWidget*> > > widgets;
 
     // Load all the services
-    KService::List offers = KServiceTypeTrader::self()->query("PowerDevilAction", \
"(Type == 'Service')"); +    KService::List offers = \
KServiceTypeTrader::self()->query("PowerDevil/Action", "(Type == 'Service')");  
     foreach (const KService::Ptr &offer, offers) {
         //try to load the specified library


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