[ksmserver/screenlocker] Hard-code path to screenlocker_greet

Porting away from KStandardDirs. As it used to be libexec it's now hard
coded through the config-ksmserver.h.cmake.
wilder-5.14
Martin Gräßlin 12 years ago
parent aacb22a1f9
commit 96da2d0288
  1. 2
      ksmserver/config-ksmserver.h.cmake
  2. 1
      ksmserver/screenlocker/CMakeLists.txt
  3. 4
      ksmserver/screenlocker/ksldapp.cpp

@ -8,3 +8,5 @@
#else
#define KCHECKPASS_BIN "${CMAKE_CURRENT_BINARY_DIR}/screenlocker/greeter/autotests/fakekcheckpass"
#endif
#define KSCREENLOCKER_GREET_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kscreenlocker_greet"

@ -2,6 +2,7 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1223)
add_subdirectory(kcheckpass)
add_subdirectory(data)
add_subdirectory(greeter)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
set(screensaver_dbusXML dbus/org.freedesktop.ScreenSaver.xml)
set(kscreensaver_dbusXML dbus/org.kde.screensaver.xml)

@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "lockwindow.h"
#include "logind.h"
#include "kscreensaversettings.h"
#include <config-ksmserver.h>
// workspace
#include <kdisplaymanager.h>
// KDE
@ -34,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KLocalizedString>
// #include <KNotification>
#include <KProcess>
#include <KStandardDirs>
#include <KGlobalAccel>
#include <KCrash>
#include <KDebug>
@ -308,7 +308,7 @@ bool KSldApp::startLockProcess(bool immediateLock)
if (immediateLock) {
args << "--immediateLock";
}
m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")), args);
m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args);
// we wait one minute
if (!m_lockProcess->waitForStarted(60000)) {
m_lockProcess->kill();

Loading…
Cancel
Save