Hello community, here is the log from the commit of package kcm_sddm for openSUSE:Factory checked in at 2015-10-30 13:41:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm_sddm (Old) and /work/SRC/openSUSE:Factory/.kcm_sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm_sddm" Changes: -------- --- /work/SRC/openSUSE:Factory/kcm_sddm/kcm_sddm.changes 2015-10-19 22:16:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new/kcm_sddm.changes 2015-10-30 13:41:07.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Oct 25 15:13:29 UTC 2015 - [email protected] + +- Add set-default-session-to-plasma5-for-autologin.patch: set the + default autologin session to plasma5.desktop (boo#951886) + +------------------------------------------------------------------- New: ---- set-default-session-to-plasma5-for-autologin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_sddm.spec ++++++ --- /var/tmp/diff_new_pack.FIyFHw/_old 2015-10-30 13:41:08.000000000 +0100 +++ /var/tmp/diff_new_pack.FIyFHw/_new 2015-10-30 13:41:08.000000000 +0100 @@ -25,6 +25,8 @@ Release: 0 Url: https://projects.kde.org/projects/kdereview/sddm-kcm/repository Source: sddm-kcm-%{version}.tar.xz +# PATCH-FIX-OPENSUSE set-default-session-to-plasma5-for-autologin.patch boo#951886 [email protected] -- set the default autologin session to plasma5.desktop +Patch: set-default-session-to-plasma5-for-autologin.patch BuildRequires: extra-cmake-modules BuildRequires: kauth-devel BuildRequires: kconfigwidgets-devel @@ -59,6 +61,7 @@ %lang_package %prep %setup -q -n sddm-kcm-%{version} +%patch -p1 %build %cmake_kf5 -d build ++++++ set-default-session-to-plasma5-for-autologin.patch ++++++ diff --git a/src/advanceconfig.cpp b/src/advanceconfig.cpp index 627f1d4..10ac5c9 100644 --- a/src/advanceconfig.cpp +++ b/src/advanceconfig.cpp @@ -90,7 +90,7 @@ void AdvanceConfig::load() const QString currentUser = mConfig->group("Autologin").readEntry("User", ""); configUi->userList->setCurrentIndex(userModel->indexOf(currentUser)); - const QString autologinSession = mConfig->group("Autologin").readEntry("Session", ""); + const QString autologinSession = mConfig->group("Autologin").readEntry("Session", "plasma5.desktop"); configUi->sessionList->setCurrentIndex(sessionModel->indexOf(autologinSession)); configUi->autoLogin->setChecked(!currentUser.isEmpty()); @@ -123,7 +123,9 @@ QVariantMap AdvanceConfig::save() } args["sddm.conf/Autologin/User"] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : ""; - args["sddm.conf/Autologin/Session"] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : ""; + if (configUi->autoLogin->isChecked()) { // only save the Autologin session if Autologin is actually enabled otherwise we would override the default session with "" if disabled + args["sddm.conf/Autologin/Session"] = configUi->sessionList->currentData(); + } args["sddm.conf/Autologin/Relogin"] = configUi->reloginAfterQuit->isChecked(); //TODO session
