Merge lp:~larsu/indicator-messages/lp956147 into lp:indicator-messages/0.3

[Lars Karlitski]

[Charles Kerr (charlesk)]

Looks good!

I noticed that dbusmenu-glib's menuitem.h has this:

> #define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon"

so I tweaked the patch to use the symbolic name rather than the string literal.

review: Approve

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2012-04-05 14:37:12 +0000
+++ src/messages-service.c	2012-04-10 16:11:23 +0000
@@ -29,7 +29,6 @@
 #include <libindicator/indicator-service.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include <libdbusmenu-glib/client.h>
 #include <libdbusmenu-glib/server.h>
@@ -665,9 +664,7 @@
 	g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none");
 	DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data);
 	if (mi != NULL) {
-#if GTK_CHECK_VERSION(3, 0, 0)
-		dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "");
-#endif
+		dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "blank-icon");
 		dbusmenu_menuitem_child_append(shell, mi);
 	}
 	resort_menu(shell);