From 08cd32e5fd4a2c148cdad4255e674e19ae947c35 Mon Sep 17 00:00:00 2001 From: huangjiawen Date: Fri, 30 Jun 2023 09:33:55 +0800 Subject: [PATCH] fix(coredump): Fix crash when clicking on the power option button in vnc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复在vnc下点击电源选项按钮崩溃 Signed-off-by: huangjiawen --- ...-crash-when-clicking-on-the-power-op.patch | 31 +++++++++++++++++++ kiran-menu.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-fix-coredump-Fix-crash-when-clicking-on-the-power-op.patch diff --git a/0001-fix-coredump-Fix-crash-when-clicking-on-the-power-op.patch b/0001-fix-coredump-Fix-crash-when-clicking-on-the-power-op.patch new file mode 100644 index 0000000..236d643 --- /dev/null +++ b/0001-fix-coredump-Fix-crash-when-clicking-on-the-power-op.patch @@ -0,0 +1,31 @@ +From f5d0a115fa44bd1a3a61b2a109956a15130e11e4 Mon Sep 17 00:00:00 2001 +From: huangjiawen +Date: Tue, 27 Jun 2023 18:51:42 +0800 +Subject: [PATCH] fix(coredump): Fix crash when clicking on the power option + button in vnc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复在vnc下点击电源选项按钮崩溃 + +Signed-off-by: huangjiawen +--- + src/common/kiran-power.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/kiran-power.cpp b/src/common/kiran-power.cpp +index 9ef8a2c..8485a9f 100644 +--- a/src/common/kiran-power.cpp ++++ b/src/common/kiran-power.cpp +@@ -366,6 +366,7 @@ bool KiranPower::can_logout() + bool KiranPower::can_switch_user() + { + RETURN_VAL_IF_TRUE(this->settings_->get_boolean(STARTMENU_LOCKDOWN_KEY_DISABLE_USER_SWITCHING), false); ++ RETURN_VAL_IF_FALSE(this->seat_manager_proxy_, false); + + try + { +-- +2.33.0 + diff --git a/kiran-menu.spec b/kiran-menu.spec index fc4c3c5..88ec387 100644 --- a/kiran-menu.spec +++ b/kiran-menu.spec @@ -1,11 +1,13 @@ Name: kiran-menu Version: 2.5.1 -Release: 1 +Release: 2 Summary: Applets for mate panel from Kiran Desktop License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-fix-coredump-Fix-crash-when-clicking-on-the-power-op.patch + BuildRequires: cmake > 3.0 BuildRequires: gcc-c++ BuildRequires: gtkmm30-devel @@ -96,6 +98,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ %changelog +* Fri Jun 30 2023 huangjiawen - 2.5.1-2 +- KYOS-F: Fix crash when clicking on the power option button in vnc. + * Wed May 10 2023 tangjie02 - 2.5.1-1 - KYOS-F: replace suspend/hibernate/shutdown api with SessionManager.