mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-05 01:40:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close dbus menu when unregistering sni

Browse source
This commit is contained in:
blinxen 2025-10-13 21:28:33 +02:00
parent 023e68a673
commit 9c1da3a631
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/swaybar/tray/dbusmenu.h
View file

@ -8,6 +8,8 @@ void swaybar_dbusmenu_open(struct swaybar_sni *sni,
struct swaybar_output *output, struct swaybar_seat *seat, uint32_t serial, struct swaybar_output *output, struct swaybar_seat *seat, uint32_t serial,
int x, int y); int x, int y);
void swaybar_dbusmenu_destroy(struct swaybar_dbusmenu *menu);
bool dbusmenu_pointer_button(void *data, struct wl_pointer *wl_pointer, bool dbusmenu_pointer_button(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, uint32_t time_, uint32_t button, uint32_t state); uint32_t serial, uint32_t time_, uint32_t button, uint32_t state);

5
swaybar/tray/host.c
View file

@ -7,6 +7,7 @@
#include "swaybar/tray/host.h" #include "swaybar/tray/host.h"
#include "swaybar/tray/item.h" #include "swaybar/tray/item.h"
#include "swaybar/tray/tray.h" #include "swaybar/tray/tray.h"
#include "swaybar/tray/dbusmenu.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "stringop.h" #include "stringop.h"
@ -55,7 +56,9 @@ static int handle_sni_unregistered(sd_bus_message *msg, void *data,
int idx = list_seq_find(tray->items, cmp_sni_id, id); int idx = list_seq_find(tray->items, cmp_sni_id, id);
if (idx != -1) { if (idx != -1) {
sway_log(SWAY_INFO, "Unregistering Status Notifier Item '%s'", id); sway_log(SWAY_INFO, "Unregistering Status Notifier Item '%s'", id);
destroy_sni(tray->items->items[idx]); struct swaybar_sni *sni = tray->items->items[idx];
swaybar_dbusmenu_destroy(sni->tray->menu);
destroy_sni(sni);
list_del(tray->items, idx); list_del(tray->items, idx);
set_bar_dirty(tray->bar); set_bar_dirty(tray->bar);
} }