aboutsummaryrefslogtreecommitdiff
path: root/swaybar/tray/watcher.c
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2020-03-09 11:09:25 +0000
committerFurkan Sahin <furkan-dev@proton.me>2020-03-09 11:09:25 +0000
commit02415b33982db0058f2ee414a0a839dd79b87c9d (patch)
tree950e0644894076b22a421ed50817409f782998a0 /swaybar/tray/watcher.c
parent43d4c80f6653e51f8efb8869edb8e5c0f8a1ef49 (diff)
tray: track SNI callbacks
This removes any pending messages once the item is destroyed. Furthermore, this installs SNI event calbacks asynchronously in order to prevent sd-bus from bypassing pending messages.
Diffstat (limited to 'swaybar/tray/watcher.c')
-rw-r--r--swaybar/tray/watcher.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/swaybar/tray/watcher.c b/swaybar/tray/watcher.c
index 951a0589..16afc27c 100644
--- a/swaybar/tray/watcher.c
+++ b/swaybar/tray/watcher.c
@@ -182,7 +182,13 @@ struct swaybar_watcher *create_watcher(char *protocol, sd_bus *bus) {
ret = sd_bus_request_name(bus, watcher->interface, 0);
if (ret < 0) {
- sway_log(SWAY_ERROR, "Failed to acquire service name: %s", strerror(-ret));
+ if (-ret == EEXIST) {
+ sway_log(SWAY_DEBUG, "Failed to acquire service name '%s':"
+ "another tray is already running", watcher->interface);
+ } else {
+ sway_log(SWAY_ERROR, "Failed to acquire service name '%s': %s",
+ watcher->interface, strerror(-ret));
+ }
goto error;
}