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.

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;
         }