Merge lp:~macslow/notify-osd/theme-icon-prefix into lp:notify-osd/karmic

[Mirco Müller]

[Mirco Müller (macslow)]

This is asac's lp:~asac/notify-osd/theme-icon-prefix adapted to cleanly apply to lp:notify-osd/karmic. See https://code.edge.launchpad.net/~asac/notify-osd/theme-icon-prefix/+merge/12731 for a description.

[lp:~macslow/notify-osd/theme-icon-prefix]

404. By Mirco Müller on 2009-10-19

added ifdef-guard for the special icon-name-substituion

[Ted Gould (ted)]

Looks good. In general I wouldn't use the globing like this:

  NOTIFY_OSD_ICON_PREFIX "-%s"

As if that ever was to include a format string or anything it would create weird errors and/or bugs. Now it's all very self contained, but it just sets you up for an easy bug later.

review: Approve

[lp:~macslow/notify-osd/theme-icon-prefix]

405. By Mirco Müller on 2009-10-19

clearly indicate that the icon-name-substitution is only a temp. workaround and will not be kept forever in notify-osd

[Mirco Müller (macslow)]

> Looks good. In general I wouldn't use the globing like this:
>
> NOTIFY_OSD_ICON_PREFIX "-%s"
>
> As if that ever was to include a format string or anything it would create
> weird errors and/or bugs. Now it's all very self contained, but it just sets
> you up for an easy bug later.

This is not meant to be kept around for long, so making this more robust would only lure us into keeping it longer than we want. It'

[lp:~macslow/notify-osd/theme-icon-prefix]

406. By Mirco Müller on 2009-10-19

issue a warning message during compilation about the temp. nature of the icon-name-substitution

=== modified file 'src/bubble.c'
--- src/bubble.c	2009-10-19 18:06:10 +0000
+++ src/bubble.c	2009-10-19 19:29:10 +0000
@@ -113,6 +113,12 @@
 	A
 };
 
+#define TEMPORARY_ICON_PREFIX_WORKAROUND 1
+#ifdef TEMPORARY_ICON_PREFIX_WORKAROUND
+#warning "--== Using the icon-name-substitution! This is a temp. workaround not going to be maintained for long! ==--"
+#define NOTIFY_OSD_ICON_PREFIX "notification"
+#endif
+
 // FIXME: this is in class Defaults already, but not yet hooked up so for the
 // moment we use the macros here, these values reflect the visual-guideline
 // for jaunty notifications
@@ -2377,11 +2383,39 @@
 }
 
 void
+bubble_set_icon_from_path (Bubble*      self,
+			   const gchar* filepath)
+{
+	Defaults*      d;
+	BubblePrivate* priv;
+
+	if (!self || !IS_BUBBLE (self) || !g_strcmp0 (filepath, ""))
+		return;
+
+	priv = GET_PRIVATE (self);
+
+	if (priv->icon_pixbuf)
+	{
+		g_object_unref (priv->icon_pixbuf);
+		priv->icon_pixbuf = NULL;
+	}
+
+	d = self->defaults;
+	priv->icon_pixbuf = load_icon (filepath,
+				       EM2PIXELS (defaults_get_icon_size (d), d));
+
+	_refresh_icon (self);
+}
+
+void
 bubble_set_icon (Bubble*      self,
 		 const gchar* filename)
 {
 	Defaults*      d;
 	BubblePrivate* priv;
+#ifdef TEMPORARY_ICON_PREFIX_WORKAROUND
+	gchar*         notify_osd_iconname;
+#endif
 
  	if (!self || !IS_BUBBLE (self) || !g_strcmp0 (filename, ""))
 		return;
@@ -2395,9 +2429,20 @@
 	}
 
 	d = self->defaults;
-	priv->icon_pixbuf = load_icon (filename,
+
+#ifdef TEMPORARY_ICON_PREFIX_WORKAROUND
+	notify_osd_iconname = g_strdup_printf (NOTIFY_OSD_ICON_PREFIX "-%s",
+					       filename);
+	priv->icon_pixbuf = load_icon (notify_osd_iconname,
 				       EM2PIXELS (defaults_get_icon_size (d),
 						  d));
+	g_free (notify_osd_iconname);
+#endif
+
+	// fallback to non-notify-osd name
+	if (!priv->icon_pixbuf)
+		priv->icon_pixbuf = load_icon (filename,
+					       EM2PIXELS (defaults_get_icon_size (d), d));
 
 	_refresh_icon (self);
 }

=== modified file 'src/bubble.h'
--- src/bubble.h	2009-08-27 09:52:34 +0000
+++ src/bubble.h	2009-10-19 19:29:10 +0000
@@ -109,6 +109,10 @@
 bubble_get_message_body (Bubble* self);
 
 void
+bubble_set_icon_from_path (Bubble*      self,
+			   const gchar* filepath);
+
+void
 bubble_set_icon (Bubble*      self,
 		 const gchar* filename);
 

=== modified file 'src/stack.c'
--- src/stack.c	2009-09-24 12:59:26 +0000
+++ src/stack.c	2009-10-19 19:29:10 +0000
@@ -725,7 +725,7 @@
 		{
 			g_debug("Using image_path hint\n");
 			if ((data && G_VALUE_HOLDS_STRING (data)))
-				bubble_set_icon (bubble, g_value_get_string(data));
+				bubble_set_icon_from_path (bubble, g_value_get_string(data));
 			else
 				g_warning ("image_path hint is not a string\n");
 		}