packages/kiran-cc-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!92 fix(keybindings):Remove power and logout invalid key from normal desktop

Browse Source 
From: @meizhigang 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2023-08-18 10:03:04 +00:00 committed by Gitee
commit 3ab3c91044
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-fix-keybindings-Remove-power-and-logout-invalid-key-.patch Normal file
View File

@ -0,0 +1,48 @@
From 355ab0e8de25da09a2426e80d0ebed4481a4f65a Mon Sep 17 00:00:00 2001
From: meizhigang <meizhigang@kylinsec.com.cn>
Date: Fri, 18 Aug 2023 16:13:38 +0800
Subject: [PATCH] fix(keybindings):Remove power and logout invalid key from
normal desktop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 移除通用桌面环境中的关机和注销快捷键
Related #11242
---
data/keybindings/01-desktop-extend-key.xml | 4 ++++
data/keybindings/01-desktop-key.xml | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/keybindings/01-desktop-extend-key.xml b/data/keybindings/01-desktop-extend-key.xml
index e9b8d13..b11ab83 100644
--- a/data/keybindings/01-desktop-extend-key.xml
+++ b/data/keybindings/01-desktop-extend-key.xml
@@ -5,4 +5,8 @@
<KeyListEntry name="show-desktop" description="Show the desktop"/>
+ <KeyListEntry name="logout" description="Log out"/>
+
+ <KeyListEntry name="power" description="Shut down"/>
+
</KeyListEntries>
diff --git a/data/keybindings/01-desktop-key.xml b/data/keybindings/01-desktop-key.xml
index a46de6a..f1078c7 100644
--- a/data/keybindings/01-desktop-key.xml
+++ b/data/keybindings/01-desktop-key.xml
@@ -9,10 +9,6 @@
<KeyListEntry name="www" description="Launch web browser"/>
- <KeyListEntry name="logout" description="Log out"/>
-
- <KeyListEntry name="power" description="Shut down"/>
-
<KeyListEntry name="screensaver" description="Lock screen"/>
<KeyListEntry name="home" description="Home folder"/>
--
2.27.0

6
kiran-cc-daemon.spec
View File

@ -1,6 +1,6 @@
Name: kiran-cc-daemon
Version: 2.5.1
Release: 19
Release: 20
Summary: DBus daemon for Kiran Desktop
License: MulanPSL-2.0
@ -23,6 +23,7 @@ Patch0014: 0001-fix-keyboard-Fix-ci-build-error.patch
Patch0015: 0001-fix-display-Fix-nvidia-display-while-no-enabled-moni.patch
Patch0016: 0001-fix-xsettings-Fix-the-problem-that-variable-serial-i.patch
Patch0017: 0001-fix-accounts-Fix-user-icon-file-display-while-change.patch
Patch0018: 0001-fix-keybindings-Remove-power-and-logout-invalid-key-.patch
BuildRequires: cmake >= 3.2
BuildRequires: pkgconfig(glibmm-2.4)
@ -192,6 +193,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
%{_libdir}/pkgconfig/kiran-cc-daemon.pc
%changelog
* Fri Aug 18 2023 meizhigang <meizhigang@kylinsec.com.cn> - 2.5.1-20
- KYOS-B: Remove power and logout invalid key from normal desktop (#11242)
* Wed Aug 16 2023 meizhigang <meizhigang@kylinsec.com.cn> - 2.5.1-19
- KYOS-F: Fix user icon file display while change and login (#12711)