Merge lp:~larsu/indicator-messages/lp1056595 into lp:indicator-messages/12.10

[Lars Karlitski]

Include fallback icon names

And use g_icon_new_from_string in the indicator to make it load fallbacks.

Fall back to indicator-messages{,-new} for icon themes that don't have the icons with status emblems yet.

Also fixes a small bug in messages-service: It used the icon string directly, which breaks down when fallbacks are specified.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./label=quantal/20/console

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Looks good!

review: Approve

=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2012-09-25 07:47:00 +0000
+++ src/indicator-messages.c	2012-09-28 15:12:23 +0000
@@ -340,11 +340,20 @@
 indicator_messages_update_icon (IndicatorMessages *self,
                                 GVariant          *state)
 {
+	GIcon *icon;
+	GError *error = NULL;
+
 	g_return_if_fail (g_variant_is_of_type (state, G_VARIANT_TYPE_STRING));
 
-	gtk_image_set_from_icon_name (GTK_IMAGE (self->image),
-				      g_variant_get_string (state, NULL),
-				      GTK_ICON_SIZE_LARGE_TOOLBAR);
+	icon = g_icon_new_for_string (g_variant_get_string (state, NULL), &error);
+	if (icon == NULL) {
+		g_warning ("unable to load icon: %s", error->message);
+		g_error_free (error);
+	}
+	else {
+		gtk_image_set_from_gicon (GTK_IMAGE (self->image), icon, GTK_ICON_SIZE_LARGE_TOOLBAR);
+		g_object_unref (icon);
+	}
 }
 
 static void
 
=== modified file 'src/messages-service.c'
--- src/messages-service.c	2012-09-19 06:28:17 +0000
+++ src/messages-service.c	2012-09-28 15:12:23 +0000
@@ -70,6 +70,10 @@
 		g_string_append (name, "-new");
 
 	icon = g_themed_icon_new (name->str);
+	g_themed_icon_append_name (G_THEMED_ICON (icon),
+				   draws_attention ? "indicator-messages-new"
+						   : "indicator-messages");
+
 	iconstr = g_icon_to_string (icon);
 
 	g_object_unref (icon);