kiran-menu/0005-fix-sn-icon-Fixed-case-where-kiran_sn_icon_context_m.patch
luoqing f6af2b6120 fix(tray):Fixed an issue with the MenuItem property set and Menu not set
- 修复menuItem属性设置为不可见后,但仍然可见的问题
  修复当托盘程序未设置Menu时,未调用kiran_sn_icon_context_menu的情况

Close #17216
2023-10-08 14:20:06 +08:00

33 lines
1.1 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From b0137c26ea84240a80c693650c5c70ec81323a52 Mon Sep 17 00:00:00 2001
From: luoqing <luoqing@kylinsec.com.cn>
Date: Sun, 8 Oct 2023 09:49:05 +0800
Subject: [PATCH 1/2] fix(sn-icon):Fixed case where kiran_sn_icon_context_menu
was not called when Menu was not set by tray program
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复当托盘程序未设置Menu时未调用kiran_sn_icon_context_menu的情况
Close #17216
---
src/tray/kiran-sn-icon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tray/kiran-sn-icon.c b/src/tray/kiran-sn-icon.c
index a36040d..0309ee4 100644
--- a/src/tray/kiran-sn-icon.c
+++ b/src/tray/kiran-sn-icon.c
@@ -1230,7 +1230,7 @@ kiran_sn_icon_button_press_event(GtkWidget *widget,
}
else if (event->button == 3)
{
- if (priv->gmenu != NULL)
+ if ((g_strcmp0(priv->menu, "/NO_DBUSMENU") != 0) && priv->gmenu != NULL)
{
gtk_menu_popup_at_widget(priv->gmenu, widget,
GDK_GRAVITY_SOUTH_WEST,
--
2.33.0