Attachment #198270 for bug #232356

Lines 1-6 Link Here

(-)sddm-kcm/src/CMakeLists.txt (+2 lines)
1	set(SDDM_CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file")	1	set(SDDM_CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file")
2	set(SDDM_CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory")	2	set(SDDM_CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory")
3	set(SDDM_SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory")	3	set(SDDM_SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory")
		4	set(XSESSIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/xsessions" CACHE PATH "Path of the xsessions")
		5	set(WAYLAND_SESSIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/wayland-sessions" CACHE PATH "Path of the wayland sessions")
4		6
5	configure_file(config.h.in config.h IMMEDIATE @ONLY)	7	configure_file(config.h.in config.h IMMEDIATE @ONLY)
6	# add_subdirectory(configwidgets)	8	# add_subdirectory(configwidgets)

Lines 4-8 Link Here

(-)sddm-kcm/src/config.h.in (+2 lines)
4	#define SDDM_CONFIG_FILE "@SDDM_CONFIG_FILE@"	4	#define SDDM_CONFIG_FILE "@SDDM_CONFIG_FILE@"
5	#define SDDM_CONFIG_DIR "@SDDM_CONFIG_DIR@"	5	#define SDDM_CONFIG_DIR "@SDDM_CONFIG_DIR@"
6	#define SDDM_SYSTEM_CONFIG_DIR "@SDDM_SYSTEM_CONFIG_DIR@"	6	#define SDDM_SYSTEM_CONFIG_DIR "@SDDM_SYSTEM_CONFIG_DIR@"
		7	#define XSESSIONS_DIR "@XSESSIONS_DIR@"
		8	#define WAYLAND_SESSIONS_DIR "@WAYLAND_SESSIONS_DIR@"
7		9
8	#endif //CONFIG_H	10	#endif //CONFIG_H

Lines 17-22 Link Here

(-)sddm-kcm/src/sessionmodel.cpp (-2 / +3 lines)
17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18	***************************************************************************/	18	***************************************************************************/
19		19
		20	#include "config.h"
20	#include "sessionmodel.h"	21	#include "sessionmodel.h"
21		22
22	#include <QDir>	23	#include <QDir>
Lines 46-53 Link Here
46	};	47	};
47		48
48	SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) {	49	SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) {
49	loadDir(QStringLiteral("/usr/share/xsessions"), SessionTypeX);	50	loadDir(QStringLiteral(XSESSIONS_DIR), SessionTypeX);
50	loadDir(QStringLiteral("/usr/share/wayland-sessions"), SessionTypeWayland);	51	loadDir(QStringLiteral(WAYLAND_SESSIONS_DIR), SessionTypeWayland);
51	}	52	}
52		53
53	SessionModel::~SessionModel() {	54	SessionModel::~SessionModel() {

Return to bug 232356