From: Johan Malm <johanmalm@users.noreply.github.com>
Date: Sat, 19 Oct 2024 18:44:24 +0000 (+0100)
Subject: icon-loader: use relaxed load options (#2248)
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=6918169aa3892e3a51444d07d25c234c950f3fa2;p=proto%2Flabwc.git

icon-loader: use relaxed load options (#2248)
---

diff --git a/src/icon-loader.c b/src/icon-loader.c
index 87ae2700..3d324211 100644
--- a/src/icon-loader.c
+++ b/src/icon-loader.c
@@ -69,8 +69,23 @@ icon_loader_init(struct server *server)
 	if (!loader->desktop_db) {
 		goto err_desktop_db;
 	}
+
+	/*
+	 * We set some relaxed load options to accommodate delinquent themes in
+	 * the wild, namely:
+	 *
+	 * - SFDO_ICON_THEME_LOAD_OPTION_ALLOW_MISSING to "impose less
+	 *   restrictions on the format of icon theme files"
+	 *
+	 * - SFDO_ICON_THEME_LOAD_OPTION_RELAXED to "continue loading even if it
+	 *   fails to find a theme or one of its dependencies."
+	 */
+	int load_options = SFDO_ICON_THEME_LOAD_OPTIONS_DEFAULT
+		| SFDO_ICON_THEME_LOAD_OPTION_ALLOW_MISSING
+		| SFDO_ICON_THEME_LOAD_OPTION_RELAXED;
+
 	loader->icon_theme = sfdo_icon_theme_load(loader->icon_ctx,
-		rc.icon_theme_name, SFDO_ICON_THEME_LOAD_OPTIONS_DEFAULT);
+		rc.icon_theme_name, load_options);
 	if (!loader->icon_theme) {
 		goto err_icon_theme;
 	}