mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: handle new and lost StatusNotifierWatcher

Browse source
This commit is contained in:
Ian Fan 2018-12-17 14:08:16 +00:00
parent 8ffb7f0529
commit 371089f62c
2 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
swaybar/tray/tray.c
View file

@ -12,6 +12,27 @@
#include "list.h"
#include "log.h"
static int handle_lost_watcher(sd_bus_message *msg,
void *data, sd_bus_error *error) {
char *service, *old_owner, *new_owner;
int ret = sd_bus_message_read(msg, "sss", &service, &old_owner, &new_owner);
if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to parse owner change message: %s", strerror(-ret));
return ret;
}
if (!*new_owner) {
struct swaybar_tray *tray = data;
if (strcmp(service, "org.freedesktop.StatusNotifierWatcher") == 0) {
tray->watcher_xdg = create_watcher("freedesktop", tray->bus);
} else if (strcmp(service, "org.kde.StatusNotifierWatcher") == 0) {
tray->watcher_kde = create_watcher("kde", tray->bus);
}
}
return 0;
}
struct swaybar_tray *create_tray(struct swaybar *bar) {
wlr_log(WLR_DEBUG, "Initializing tray");
@ -33,6 +54,14 @@ struct swaybar_tray *create_tray(struct swaybar *bar) {
tray->watcher_xdg = create_watcher("freedesktop", tray->bus);
tray->watcher_kde = create_watcher("kde", tray->bus);
ret = sd_bus_match_signal(bus, NULL, "org.freedesktop.DBus",
"/org/freedesktop/DBus", "org.freedesktop.DBus",
"NameOwnerChanged", handle_lost_watcher, tray);
if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to subscribe to unregistering events: %s",
strerror(-ret));
}
tray->items = create_list();
init_host(&tray->host_xdg, "freedesktop", tray);