fix(grab): where typing could not be done due to keyboard grab conflicts

- 修复长按快捷键后锁定无法输入，多次尝试抓取，避免和后端键盘抓取冲突导致未抓取成功

Closes #I7C0TD

0001-fix-background-logind-session-Deleting-the-dbus-serv.patch

@@ -1,36 +0,0 @@
-From 74493a9280e5840b394f75d047317c4f68784ad3 Mon Sep 17 00:00:00 2001
-From: liuxinhao <liuxinhao@kylinsec.com.cn>
-Date: Thu, 15 Dec 2022 17:15:40 +0800
-Subject: [PATCH] fix(background,logind session): Deleting the dbus service
- file and pulling it up by systemd may cause problems, such as incorrect
- pulling time and failure to obtain the logind session address
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 去除dbus service文件,由systemd拉起可能会带来拉起时间点不对,获取logind session地址失败等问题
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc48bc4..ee74108 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,7 +113,11 @@ configure_file(data/com.kylinsec.Kiran.ScreenSaver.service.in ${CMAKE_BINARY_DIR
- install(TARGETS ${PROJECT_NAME} DESTINATION ${SCREENSAVER_BIN_DIR})
- install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_INSTALL_DIR})
- install(FILES ${DEVEL_HEADER} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/kiran-screensaver)
--install(FILES ${CMAKE_BINARY_DIR}/com.kylinsec.Kiran.ScreenSaver.service DESTINATION ${DBUS_SERVICE_INSTALL_DIR})
-+#不安装dbus-1 service文件
-+#1. 若安装dbus-1service文件,kiran-session-daemon POWER插件可能过早拉起kiran-screensaver导致获取壁纸失败
-+#2. 若安装dbus-1service文件,systemd拉起kiran-screensaver可能出现通过Logind Manager的GetSessionByPID方法获取当前logind session dbus地址失败的问题
-+#经过考虑,kiran-screensaver只安装xdg/autostart文件,通过会话管理拉起
-+#install(FILES ${CMAKE_BINARY_DIR}/com.kylinsec.Kiran.ScreenSaver.service DESTINATION ${DBUS_SERVICE_INSTALL_DIR})
- install(FILES data/kiran-screensaver.desktop DESTINATION ${XDG_AUTO_START_DIR})
- install(FILES data/kiran-screensaver DESTINATION /${CMAKE_INSTALL_SYSCONFDIR}/pam.d/)
- install(FILES data/com.kylinsec.kiran.screensaver.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/)
-\ No newline at end of file
--- 
-2.33.0
-

kiran-screensaver.spec

@@ -1,14 +1,12 @@
 Name:    kiran-screensaver
-Version: 2.2.2
-Release: 3
+Version: 2.2.3
+Release: 1
 Summary: Kiran Desktop Screensaver Backend
 Summary(zh_CN): kiran桌面屏保后端
 
 License: MulanPSL-2.0
 
 Source0: %{name}-%{version}.tar.gz
-Patch01: 0001-fix-background-logind-session-Deleting-the-dbus-serv.patch
-Patch02: 0002-fix-translate-add-some-translation.patch
 
 BuildRequires: gcc-c++
 BuildRequires: cmake
@@ -72,6 +70,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
 rm -rf %{buildroot}
 
 %changelog
+* Sun Jun 25 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.2.3-1
+- KYOS-B: where typing could not be done due to keyboard grab conflicts(#I7C0TD)
+
 * Mon Apr 10 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.2.2-3
 - KYOS-T: add some translation