summaryrefslogtreecommitdiffstats
path: root/swaybar/tray/watcher.c
diff options
context:
space:
mode:
Diffstat (limited to 'swaybar/tray/watcher.c')
-rw-r--r--swaybar/tray/watcher.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/swaybar/tray/watcher.c b/swaybar/tray/watcher.c
index 198c6c85..68052ed9 100644
--- a/swaybar/tray/watcher.c
+++ b/swaybar/tray/watcher.c
@@ -27,7 +27,7 @@ static int handle_lost_service(sd_bus_message *msg,
27 char *service, *old_owner, *new_owner; 27 char *service, *old_owner, *new_owner;
28 int ret = sd_bus_message_read(msg, "sss", &service, &old_owner, &new_owner); 28 int ret = sd_bus_message_read(msg, "sss", &service, &old_owner, &new_owner);
29 if (ret < 0) { 29 if (ret < 0) {
30 wlr_log(WLR_ERROR, "Failed to parse owner change message: %s", strerror(-ret)); 30 sway_log(SWAY_ERROR, "Failed to parse owner change message: %s", strerror(-ret));
31 return ret; 31 return ret;
32 } 32 }
33 33
@@ -37,7 +37,7 @@ static int handle_lost_service(sd_bus_message *msg,
37 using_standard_protocol(watcher) ? cmp_id : cmp_service, service); 37 using_standard_protocol(watcher) ? cmp_id : cmp_service, service);
38 if (idx != -1) { 38 if (idx != -1) {
39 char *id = watcher->items->items[idx]; 39 char *id = watcher->items->items[idx];
40 wlr_log(WLR_DEBUG, "Unregistering Status Notifier Item '%s'", id); 40 sway_log(SWAY_DEBUG, "Unregistering Status Notifier Item '%s'", id);
41 list_del(watcher->items, idx); 41 list_del(watcher->items, idx);
42 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface, 42 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,
43 "StatusNotifierItemUnregistered", "s", id); 43 "StatusNotifierItemUnregistered", "s", id);
@@ -46,7 +46,7 @@ static int handle_lost_service(sd_bus_message *msg,
46 46
47 idx = list_seq_find(watcher->hosts, cmp_id, service); 47 idx = list_seq_find(watcher->hosts, cmp_id, service);
48 if (idx != -1) { 48 if (idx != -1) {
49 wlr_log(WLR_DEBUG, "Unregistering Status Notifier Host '%s'", service); 49 sway_log(SWAY_DEBUG, "Unregistering Status Notifier Host '%s'", service);
50 free(watcher->hosts->items[idx]); 50 free(watcher->hosts->items[idx]);
51 list_del(watcher->hosts, idx); 51 list_del(watcher->hosts, idx);
52 } 52 }
@@ -59,7 +59,7 @@ static int register_sni(sd_bus_message *msg, void *data, sd_bus_error *error) {
59 char *service_or_path, *id; 59 char *service_or_path, *id;
60 int ret = sd_bus_message_read(msg, "s", &service_or_path); 60 int ret = sd_bus_message_read(msg, "s", &service_or_path);
61 if (ret < 0) { 61 if (ret < 0) {
62 wlr_log(WLR_ERROR, "Failed to parse register SNI message: %s", strerror(-ret)); 62 sway_log(SWAY_ERROR, "Failed to parse register SNI message: %s", strerror(-ret));
63 return ret; 63 return ret;
64 } 64 }
65 65
@@ -81,12 +81,12 @@ static int register_sni(sd_bus_message *msg, void *data, sd_bus_error *error) {
81 } 81 }
82 82
83 if (list_seq_find(watcher->items, cmp_id, id) == -1) { 83 if (list_seq_find(watcher->items, cmp_id, id) == -1) {
84 wlr_log(WLR_DEBUG, "Registering Status Notifier Item '%s'", id); 84 sway_log(SWAY_DEBUG, "Registering Status Notifier Item '%s'", id);
85 list_add(watcher->items, id); 85 list_add(watcher->items, id);
86 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface, 86 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,
87 "StatusNotifierItemRegistered", "s", id); 87 "StatusNotifierItemRegistered", "s", id);
88 } else { 88 } else {
89 wlr_log(WLR_DEBUG, "Status Notifier Item '%s' already registered", id); 89 sway_log(SWAY_DEBUG, "Status Notifier Item '%s' already registered", id);
90 free(id); 90 free(id);
91 } 91 }
92 92
@@ -97,18 +97,18 @@ static int register_host(sd_bus_message *msg, void *data, sd_bus_error *error) {
97 char *service; 97 char *service;
98 int ret = sd_bus_message_read(msg, "s", &service); 98 int ret = sd_bus_message_read(msg, "s", &service);
99 if (ret < 0) { 99 if (ret < 0) {
100 wlr_log(WLR_ERROR, "Failed to parse register host message: %s", strerror(-ret)); 100 sway_log(SWAY_ERROR, "Failed to parse register host message: %s", strerror(-ret));
101 return ret; 101 return ret;
102 } 102 }
103 103
104 struct swaybar_watcher *watcher = data; 104 struct swaybar_watcher *watcher = data;
105 if (list_seq_find(watcher->hosts, cmp_id, service) == -1) { 105 if (list_seq_find(watcher->hosts, cmp_id, service) == -1) {
106 wlr_log(WLR_DEBUG, "Registering Status Notifier Host '%s'", service); 106 sway_log(SWAY_DEBUG, "Registering Status Notifier Host '%s'", service);
107 list_add(watcher->hosts, strdup(service)); 107 list_add(watcher->hosts, strdup(service));
108 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface, 108 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,
109 "StatusNotifierHostRegistered", "s", service); 109 "StatusNotifierHostRegistered", "s", service);
110 } else { 110 } else {
111 wlr_log(WLR_DEBUG, "Status Notifier Host '%s' already registered", service); 111 sway_log(SWAY_DEBUG, "Status Notifier Host '%s' already registered", service);
112 } 112 }
113 113
114 return sd_bus_reply_method_return(msg, ""); 114 return sd_bus_reply_method_return(msg, "");
@@ -166,7 +166,7 @@ struct swaybar_watcher *create_watcher(char *protocol, sd_bus *bus) {
166 int ret = sd_bus_add_object_vtable(bus, &vtable_slot, obj_path, 166 int ret = sd_bus_add_object_vtable(bus, &vtable_slot, obj_path,
167 watcher->interface, watcher_vtable, watcher); 167 watcher->interface, watcher_vtable, watcher);
168 if (ret < 0) { 168 if (ret < 0) {
169 wlr_log(WLR_ERROR, "Failed to add object vtable: %s", strerror(-ret)); 169 sway_log(SWAY_ERROR, "Failed to add object vtable: %s", strerror(-ret));
170 goto error; 170 goto error;
171 } 171 }
172 172
@@ -174,14 +174,14 @@ struct swaybar_watcher *create_watcher(char *protocol, sd_bus *bus) {
174 "/org/freedesktop/DBus", "org.freedesktop.DBus", 174 "/org/freedesktop/DBus", "org.freedesktop.DBus",
175 "NameOwnerChanged", handle_lost_service, watcher); 175 "NameOwnerChanged", handle_lost_service, watcher);
176 if (ret < 0) { 176 if (ret < 0) {
177 wlr_log(WLR_ERROR, "Failed to subscribe to unregistering events: %s", 177 sway_log(SWAY_ERROR, "Failed to subscribe to unregistering events: %s",
178 strerror(-ret)); 178 strerror(-ret));
179 goto error; 179 goto error;
180 } 180 }
181 181
182 ret = sd_bus_request_name(bus, watcher->interface, 0); 182 ret = sd_bus_request_name(bus, watcher->interface, 0);
183 if (ret < 0) { 183 if (ret < 0) {
184 wlr_log(WLR_ERROR, "Failed to acquire service name: %s", strerror(-ret)); 184 sway_log(SWAY_ERROR, "Failed to acquire service name: %s", strerror(-ret));
185 goto error; 185 goto error;
186 } 186 }
187 187
@@ -192,7 +192,7 @@ struct swaybar_watcher *create_watcher(char *protocol, sd_bus *bus) {
192 watcher->hosts = create_list(); 192 watcher->hosts = create_list();
193 watcher->items = create_list(); 193 watcher->items = create_list();
194 watcher->version = 0; 194 watcher->version = 0;
195 wlr_log(WLR_DEBUG, "Registered %s", watcher->interface); 195 sway_log(SWAY_DEBUG, "Registered %s", watcher->interface);
196 return watcher; 196 return watcher;
197error: 197error:
198 sd_bus_slot_unref(signal_slot); 198 sd_bus_slot_unref(signal_slot);