From: Colin Clark <colin.clark@cclark.uk>
Date: Fri, 19 Oct 2018 17:42:55 +0000 (+0100)
Subject: Permit icon field in desktop file to be an absolute path
X-Git-Tag: v1.5~56
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=a4988a48a31bce3f21e953b45efdab775a9b3db6

Permit icon field in desktop file to be an absolute path
---

diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c
index 4b2af513..7cf4d697 100644
--- a/src/pixbuf_util.c
+++ b/src/pixbuf_util.c
@@ -234,6 +234,15 @@ gboolean register_theme_icon_as_stock(const gchar *key, const gchar *icon)
 				{
 				DEBUG_1("Couldn't load icon %s: %s", icon2, error->message);
 				g_error_free(error);
+				error = NULL;
+
+				/* try as an absolute path */
+				pixbuf = gdk_pixbuf_new_from_file(icon, &error);
+				if (error)
+					{
+					DEBUG_1("Couldn't load icon as absolute path %s: %s", icon, error->message);
+					g_error_free(error);
+					}
 				}
 			g_free(icon2);
 			}