Merge pull request #1329 from bynect/svg-skip-err

Test png icon if svg fails to load
dunst-project · Apr 9, 2024 · a15bc5a · a15bc5a
2 parents a2bd494 + f107bba
commit a15bc5a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/test/data/icons/valid.png b/test/data/icons/valid.png
diff --git a/test/notification.c b/test/notification.c
@@ -128,20 +128,36 @@ TEST test_notification_referencing(void)
         PASS();
 }
 
-
 static struct notification *notification_load_icon_with_scaling(int min_icon_size, int max_icon_size)
 {
+        static bool svg_failed = false;
+
         struct notification *n = notification_create();
 
-        char *path = g_strconcat(base, "/data/icons/valid.svg", NULL); // 16x16
+        char *path;
+        GVariant *raw_icon = NULL;
+
+        if (!svg_failed) {
+                path = g_strconcat(base, "/data/icons/valid.svg", NULL); // 16x16
+                raw_icon = notification_setup_raw_image(path);
 
-        GVariant *rawIcon = notification_setup_raw_image(path);
+                if (raw_icon == NULL) {
+                        svg_failed = true;
+                        printf("Failed to load svg icon, using png\n");
+                        g_free(path);
+                }
+        }
+
+        if (raw_icon == NULL) {
+                path = g_strconcat(base, "/data/icons/valid.png", NULL); // 16x16
+                raw_icon = notification_setup_raw_image(path);
+        }
 
         n->min_icon_size = min_icon_size;
         n->max_icon_size = max_icon_size;
-        notification_icon_replace_data(n, rawIcon);
+        notification_icon_replace_data(n, raw_icon);
 
-        g_variant_unref(rawIcon);
+        g_variant_unref(raw_icon);
         g_free(path);
 
         return n;