From 57d64e103b0cfeafee00e4e1eff9b795e09ff145 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 31 Jul 2014 11:55:58 +0200
Subject: [PATCH] use lookandfeelaccess for logout screen

---
 ksmserver/CMakeLists.txt       | 1 +
 ksmserver/shutdowndlg.cpp      | 8 +++++---
 ksmserver/tests/CMakeLists.txt | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 49870fb54..0a1431687 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -23,6 +23,7 @@ set(ksmserver_KDEINIT_SRCS
     startup.cpp
     shutdown.cpp
     client.cpp
+    ../lookandfeelaccess/lookandfeelaccess.cpp
 #TODO: figure out what do to with these effects
 #    logouteffect.cpp
 #    fadeeffect.cpp
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index ccf6dd960..b4e59a387 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -67,6 +67,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kjob.h>
 #include <qstandardpaths.h>
 
+#include "../../lookandfeelaccess/lookandfeelaccess.h"
+
 #define FONTCOLOR "#bfbfbf"
 
 Q_DECLARE_METATYPE(Solid::PowerManagement::SleepState)
@@ -152,9 +154,9 @@ KSMShutdownDlg::KSMShutdownDlg( QWindow* parent,
     QString fileName;
     if(theme.isEmpty()) {
         ShellPluginLoader::init();
-        Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/LookAndFeel");
-        pkg.setPath("org.kde.lookandfeel");
-        fileName = pkg.filePath("logoutmainscript", QString());
+        
+        LookAndFeelAccess access;
+        fileName = access.filePath("logoutmainscript");
     } else
         fileName = theme;
 
diff --git a/ksmserver/tests/CMakeLists.txt b/ksmserver/tests/CMakeLists.txt
index 79e942e42..b5e7d820f 100644
--- a/ksmserver/tests/CMakeLists.txt
+++ b/ksmserver/tests/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 
 set(testsh_SRCS
     test.cpp
+    ../../lookandfeelaccess/lookandfeelaccess.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../shutdowndlg.cpp
 #    ${CMAKE_CURRENT_SOURCE_DIR}/../logouteffect.cpp
 #    ${CMAKE_CURRENT_SOURCE_DIR}/../curtaineffect.cpp