From f4e44cbb00daa72779c9fcf070cce1eb152fc897 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Wed, 10 Aug 2022 09:47:56 +0800 Subject: [PATCH] Fix invalid reset of automatic login option,update License,update yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复自动登录选项重置无效的问题,更新License名称,更新仓库内yaml文件 --- ...-greeter-Fix-invalid-reset-of-automa.patch | 37 +++++++++++++++++++ kiran-session-guard.spec | 2 +- kiran-session-guard.yaml | 4 ++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch create mode 100644 kiran-session-guard.yaml diff --git a/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch b/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch new file mode 100644 index 0000000..0b1e0ef --- /dev/null +++ b/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch @@ -0,0 +1,37 @@ +From a83821b50d7c900e059f5950ba93df40eb32c6c2 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Wed, 27 Jul 2022 14:47:10 +0800 +Subject: [PATCH] fix(kiran-cpanel-greeter): Fix invalid reset of automatic + login option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复自动登录选项重置无效的问题 + +Closes #I5HBZO +--- + .../kiran-cpanel-greeter/src/greeter-setting-window.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp b/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp +index 8e27e7d..816322a 100644 +--- a/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp ++++ b/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp +@@ -664,7 +664,13 @@ void GreeterSettingWindow::resetAutoLoginSettings() + { + GreeterSettingInfo::AutoLoginSetting autoLoginSetting = getAutologinSettingInfoFromBackend(); + m_autologinSwitch->setChecked(autoLoginSetting.autoLoginUser.size()); ++ + m_autologinComboWidget->setVisible(autoLoginSetting.autoLoginUser.size()); ++ if( !autoLoginSetting.autoLoginUser.isEmpty() ) ++ { ++ m_comboAutoLoginUser->setCurrentText(autoLoginSetting.autoLoginUser); ++ } ++ + m_editAutoLoginDelay->setText(QString::number(autoLoginSetting.autoLoginTimeout)); + m_origSettingInfo.autoLoginInfo = autoLoginSetting; + } +-- +2.33.0 + diff --git a/kiran-session-guard.spec b/kiran-session-guard.spec index b3c2562..b0e62fc 100644 --- a/kiran-session-guard.spec +++ b/kiran-session-guard.spec @@ -4,7 +4,7 @@ Release: 1 Summary: Kiran desktop environment login and lock screen dialog Summary(zh_CN): Kiran桌面环境登录和解锁框 -License: Mulan PSL v2 +License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz %define SHOW_VIRTUAL_KEYBOARD 0 diff --git a/kiran-session-guard.yaml b/kiran-session-guard.yaml new file mode 100644 index 0000000..222af7e --- /dev/null +++ b/kiran-session-guard.yaml @@ -0,0 +1,4 @@ +version_control: gitee +src_repo: https://gitee.com/openeuler/kiran-session-guard.git +tag_prefix: "v" +seperator: "." -- Gitee