Merge lp:~macslow/notify-osd/fix-451086 into lp:notify-osd/lucid

[Mirco Müller]

This branch fixes LP: #451086 and adds a new C-example testing the correct working of all three methods to pass icons to notifications. To have the C-example compiled - in addition to notify-osd itself - make sure to pass --with-examples=c at the configure-run.

[Ted Gould (ted)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-08-25 11:56:31 +0000
+++ .bzrignore	2010-04-07 18:13:20 +0000
@@ -197,3 +197,4 @@
 tests/*.gcno
 tests/*.gcda
 tests/*.gcov
+examples/icon-updating
 
=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2009-08-21 12:44:54 +0000
+++ examples/Makefile.am	2010-04-07 18:13:20 +0000
@@ -20,7 +20,8 @@
 		  summary-body		  \
 		  summary-only		  \
 		  append-hint-example	  \
-		  update-notifications
+		  update-notifications	  \
+		  icon-updating
 
 icon_only_SOURCES		 = example-util.c example-util.h icon-only.c
 sync_icon_only_SOURCES		 = sync-icon-only.c example-util.h example-util.c
@@ -31,6 +32,7 @@
 summary_only_SOURCES		 = summary-only.c example-util.c example-util.h
 append_hint_example_SOURCES	 = append-hint-example.c example-util.c example-util.h
 update_notifications_SOURCES	 = update-notifications.c example-util.c example-util.h
+icon_updating_SOURCES		 = icon-updating.c example-util.c example-util.h
 
 icon_only_CFLAGS	    = -I. -O0 -ggdb -Wall -Werror `pkg-config --cflags libnotify glib-2.0`
 sync_icon_only_CFLAGS	    = -I. -O0 -ggdb -Wall -Werror `pkg-config --cflags libnotify glib-2.0`
@@ -41,6 +43,7 @@
 summary_only_CFLAGS	    = -I. -O0 -ggdb -Wall -Werror `pkg-config --cflags libnotify glib-2.0`
 append_hint_example_CFLAGS  = -I. -O0 -ggdb -Wall -Werror `pkg-config --cflags libnotify glib-2.0`
 update_notifications_CFLAGS = -I. -O0 -ggdb -Wall -Werror `pkg-config --cflags libnotify glib-2.0`
+icon_updating_CFLAGS	    = -I. -O0 -ggdb -Wall -Werror `pkg-config --cflags libnotify glib-2.0`
 
 icon_only_LDFLAGS	     = `pkg-config --libs libnotify glib-2.0`
 sync_icon_only_LDFLAGS	     = `pkg-config --libs libnotify glib-2.0`
@@ -51,6 +54,7 @@
 summary_only_LDFLAGS	     = `pkg-config --libs libnotify glib-2.0`
 append_hint_example_LDFLAGS  = `pkg-config --libs libnotify glib-2.0`
 update_notifications_LDFLAGS = `pkg-config --libs libnotify glib-2.0`
+icon_updating_LDFLAGS	     = `pkg-config --libs libnotify glib-2.0`
 endif
 
 if BUILD_MONO_EXAMPLES
 
=== added file 'examples/icon-updating.c'
--- examples/icon-updating.c	1970-01-01 00:00:00 +0000
+++ examples/icon-updating.c	2010-04-07 18:13:20 +0000
@@ -0,0 +1,126 @@
+/*******************************************************************************
+**3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
+**      10        20        30        40        50        60        70        80
+**
+** Info: 
+**    Example of how to use libnotify correctly and at the same time comply to
+**    the new jaunty notification spec (read: visual guidelines)
+**
+** Compile:
+**    gcc -O0 -ggdb -Wall -Werror `pkg-config --cflags --libs libnotify \
+**    glib-2.0` icon-updating.c example-util.c -o icon-updating
+**
+** Copyright 2010 Canonical Ltd.
+**
+** Author:
+**    Mirco "MacSlow" Mueller <[e-mail]>
+**
+** This program is free software: you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 3, as published
+** by the Free Software Foundation.
+**
+** This program is distributed in the hope that it will be useful, but
+** WITHOUT ANY WARRANTY; without even the implied warranties of
+** MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+** PURPOSE.  See the GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License along
+** with this program.  If not, see <http://www.gnu.org/licenses/>.
+**
+*******************************************************************************/
+
+#include "example-util.h"
+
+int
+main (int    argc,
+      char** argv)
+{
+	NotifyNotification* notification = NULL;
+	gboolean            success;
+	GError*             error        = NULL;
+	GdkPixbuf*          pixbuf       = NULL;
+
+	if (!notify_init ("icon-updating"))
+		return 1;
+
+	// call this so we can savely use has_cap(CAP_SOMETHING) later
+	init_caps ();
+
+	// show what's supported
+	print_caps ();
+
+	// create new notification, set icon using hint "image_path"
+	notification = notify_notification_new (
+		"Test 1/3",
+		"Set icon via hint \"image_path\" to logo-icon.",
+		NULL,
+		NULL);
+	notify_notification_set_hint_string (
+		notification,
+		"image_path",
+		"/usr/share/icons/Humanity/places/64/distributor-logo.svg");
+	error = NULL;
+	success = notify_notification_show (notification, &error);
+	if (!success)
+	{
+		g_print ("Could not show notification: \"%s\".\n",
+			 error->message);
+		g_error_free (error);
+	}
+	g_signal_connect (G_OBJECT (notification),
+			  "closed",
+			  G_CALLBACK (closed_handler),
+			  NULL);
+	sleep (4); // wait a bit
+
+	// update notification using hint image_data
+	notify_notification_clear_hints (notification);
+	success = notify_notification_update (
+		notification,
+		"Test 2/3",
+		"Set icon via hint \"image_data\" to avatar-photo.",
+		NULL);
+	error = NULL;
+	pixbuf = gdk_pixbuf_new_from_file ("../icons/avatar.png", &error);
+	if (!pixbuf)
+	{
+		g_print ("Could not load image: \"%s\".\n", error->message);
+		g_error_free (error);
+	}
+	notify_notification_set_icon_from_pixbuf (notification, pixbuf);
+	g_object_unref (pixbuf);
+	error = NULL;
+	success = notify_notification_show (notification, &error);
+	if (!success)
+	{
+		g_print ("Could not show notification: \"%s\".\n",
+			 error->message);
+		g_error_free (error);
+	}
+	sleep (4); // wait a bit
+
+	// update notification using icon-parameter directly
+	notify_notification_clear_hints (notification);
+	success = notify_notification_update (
+		notification,
+		"Test 3/3",
+		"Set icon via icon-parameter directly to totem-icon.",
+		"totem");
+	error = NULL;
+	success = notify_notification_show (notification, &error);
+	if (!success)
+	{
+		g_print ("Could not show notification: \"%s\".\n",
+			 error->message);
+		g_error_free (error);
+	}
+	g_signal_connect (G_OBJECT (notification),
+			  "closed",
+			  G_CALLBACK (closed_handler),
+			  NULL);
+
+	notify_uninit ();
+
+	return 0;
+}
+
 
=== modified file 'src/bubble.c'
--- src/bubble.c	2010-04-01 09:07:06 +0000
+++ src/bubble.c	2010-04-07 18:13:20 +0000
@@ -2393,6 +2393,15 @@
 
 	priv = GET_PRIVATE (self);
 
+	// check if an app tries to set the same file as icon again, this check
+	// avoids superfluous regeneration of the tile/blur-cache for the icon,
+	// thus it improves performance in update- and append-cases
+	if (!g_strcmp0 (priv->old_icon_filename->str, filepath))
+		return;
+
+	// store the new icon-basename
+	g_string_assign (priv->old_icon_filename, filepath);
+
 	if (priv->icon_pixbuf)
 	{
 		g_object_unref (priv->icon_pixbuf);
@@ -2528,6 +2537,9 @@
 
 	priv = GET_PRIVATE (self);
 
+	// "reset" the stored the icon-filename, fixes LP: #451086
+	g_string_assign (priv->old_icon_filename, "\0");
+
 	if (priv->icon_pixbuf)
 	{
 		g_object_unref (priv->icon_pixbuf);