Merge lp:~larsu/notify-osd/1520667 into lp:notify-osd

[Lars Karlitski]

bubble_set_icon: allow absolute paths in the icon name field

bubble_set_icon: allow absolute paths in the icon name field

[Sebastien Bacher (seb128)]

Great!

review: Approve

[Sebastien Bacher (seb128)]

thanks, make check is good again with that change

review: Approve

=== modified file 'src/bubble.c'
--- src/bubble.c	2015-11-18 16:39:01 +0000
+++ src/bubble.c	2015-12-01 07:45:25 +0000
@@ -2387,7 +2387,7 @@
 		filename = g_filename_from_uri (name, NULL, &error);
 		if (filename == NULL)
 		{
-			g_printerr ("%s is not a valid file uri: %s", name, error->message);
+			g_warning ("%s is not a valid file uri: %s", name, error->message);
 			g_error_free (error);
 			return;
 		}
@@ -2396,6 +2396,14 @@
 
 		g_free (filename);
 	}
+	/* According to the spec, only file:// uris are allowed in the
+	 * name field. However, many applications send raw paths.
+	 * Support those as well, but only if they're absolute.
+	 */
+	else if (name[0] == '/')
+	{
+		priv->icon_pixbuf = gdk_pixbuf_new_from_file_at_scale (name, scale * icon_size, scale * icon_size, TRUE, NULL);
+	}
 	else
 	{
 		GError *error = NULL;
@@ -2418,7 +2426,7 @@
 
 		if (buffer == NULL)
 		{
-			g_print ("Unable to load icon '%s': %s", name, error->message);
+			g_warning ("Unable to load icon '%s': %s", name, error->message);
 			g_error_free (error);
 			return;
 		}

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2011-11-01 12:45:48 +0000
+++ tests/Makefile.am	2015-12-01 07:45:25 +0000
@@ -61,7 +61,7 @@
 	$(WNCK_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)	\
-	-DSRCDIR=\""$(top_srcdir)"\" \
+	-DSRCDIR=\""$(abs_top_srcdir)"\" \
 	-I$(top_srcdir)/src	\
 	-I$(top_srcdir)/