sway

commit 6059c744f8b24ef3321eb7896991112366896e26
parent adf7a6f8921a025fd07cfd1e58f19f589c8f31b3
Author: Pi-Yueh Chuang <pychuang@pm.me>
Date:   Wed, 17 Mar 2021 04:49:04 -0400

swaybar: silence missing IconThemePath message

IconThemePath is not a standard property in XDG's StatusNotifierItem
specification, so missing this property should not be logged as an error.

This patch changes the log level to SWAY_DEBUG when swaybar queries the
value of IconThemePath so that swaybar won't log the returned message as
an error if IconThemePath does not exist.

Closes: https://github.com/swaywm/sway/issues/6092
Diffstat:
M
swaybar/tray/item.c
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c
@@ -118,8 +118,13 @@ static int get_property_callback(sd_bus_message *msg, void *data,
 
 	int ret;
 	if (sd_bus_message_is_method_error(msg, NULL)) {
-		sway_log(SWAY_ERROR, "%s %s: %s", sni->watcher_id, prop,
-				sd_bus_message_get_error(msg)->message);
+		const sd_bus_error *err = sd_bus_message_get_error(msg);
+		sway_log_importance_t log_lv = SWAY_ERROR;
+		if ((!strcmp(prop, "IconThemePath")) &&
+				(!strcmp(err->name, SD_BUS_ERROR_UNKNOWN_PROPERTY))) {
+			log_lv = SWAY_DEBUG;
+		}
+		sway_log(log_lv, "%s %s: %s", sni->watcher_id, prop, err->message);
 		ret = sd_bus_message_get_errno(msg);
 		goto cleanup;
 	}