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

[Lars Karlitski]

[Charles Kerr (charlesk)]

I agree with you that this isn't a perfect patch, but doing things right would take more time than we have right now. It's better to put in this quick fix than to ship with the "broken" icons.

Considering the tradeoffs, this is the right fix for 12.04.

review: Approve

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2012-04-04 14:48:53 +0000
+++ src/messages-service.c	2012-04-04 17:09:26 +0000
@@ -29,6 +29,7 @@
 #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>
@@ -664,7 +665,9 @@
 	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_child_append(shell, mi);
 	}
 	resort_menu(shell);