Commit f4ac46f0 authored by David Edmundson's avatar David Edmundson

Move logout-greeter into it's own subdir out of ksmserver

Summary: No code or behavioural changes, just code tidying.

Reviewers: #plasma, broulik

Reviewed By: #plasma, broulik

Subscribers: broulik, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D15201
parent de6f8246
......@@ -149,6 +149,7 @@ add_subdirectory(freespacenotifier)
add_subdirectory(klipper)
add_subdirectory(krunner)
add_subdirectory(ksmserver)
add_subdirectory(logout-greeter)
add_subdirectory(ksplash)
add_subdirectory(systemmonitor)
add_subdirectory(statusnotifierwatcher)
......
......@@ -10,7 +10,6 @@ add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(logout-greeter)
if(BUILD_TESTING)
add_subdirectory(tests)
endif()
......
set(KSMSERVER_LOGOUT_GREETER_SRCS main.cpp shutdowndlg.cpp ../ksmserver_debug.cpp)
add_executable(ksmserver-logout-greeter ${KSMSERVER_LOGOUT_GREETER_SRCS})
set(LOGOUT_GREETER_SRCS main.cpp shutdowndlg.cpp)
ecm_qt_declare_logging_category(LOGOUT_GREETER_SRCS HEADER debug.h
IDENTIFIER LOGOUT_GREETER
CATEGORY_NAME kde.logout_greeter
DEFAULT_SEVERITY Info)
add_executable(ksmserver-logout-greeter ${LOGOUT_GREETER_SRCS})
target_link_libraries(ksmserver-logout-greeter
PW::KWorkspace
Qt5::Widgets
......
/*****************************************************************
ksmserver - the KDE session management server
Copyright 2000 Matthias Ettrich <ettrich@kde.org>
Copyright 2007 Urs Wolfer <uwolfer @ kde.org>
......@@ -24,7 +22,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include "shutdowndlg.h"
#include "ksmserver_debug.h"
#include <QApplication>
#include <QQuickItem>
......@@ -64,6 +61,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <fixx11h.h>
#include <config-workspace.h>
#include <debug.h>
#include <KWayland/Client/surface.h>
#include <KWayland/Client/plasmashell.h>
......@@ -155,15 +153,14 @@ void KSMShutdownDlg::init()
fileName = package.filePath("logoutmainscript");
if (QFile::exists(fileName)) {
//qCDebug(KSMSERVER) << "Using QML theme" << fileName;
setSource(package.fileUrl("logoutmainscript"));
} else {
qCWarning(KSMSERVER) << "Couldn't find a theme for the Shutdown dialog" << fileName;
qCWarning(LOGOUT_GREETER) << "Couldn't find a theme for the Shutdown dialog" << fileName;
return;
}
if(!errors().isEmpty()) {
qCWarning(KSMSERVER) << errors();
qCWarning(LOGOUT_GREETER) << errors();
}
connect(rootObject(), SIGNAL(logoutRequested()), SLOT(slotLogout()));
......
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_executable(logout-greeter-test main.cpp)
target_link_libraries(logout-greeter-test Qt5::Core Qt5::Concurrent)
ecm_mark_as_test(logout-greeter-test)
#define LOGOUT_GREETER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ksmserver-logout-greeter"
......@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
#include <config-ksmserver.h>
#include <config.h>
static void readFromPipe(int pipe)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment