Merge lp:~larsu/indicator-messages/fix-939953 into lp:indicator-messages/0.3

[Lars Karlitski]

Inserts a blank icon for app shortcuts to make them align properly.

Also reverts r244, which is another alignment issue. For some reason, I needed to put more padding in back then than we need now, I assume it was the theme's fault.

[Ted Gould (ted)]

Looks good!

review: Approve

=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2012-02-10 21:42:43 +0000
+++ src/indicator-messages.c	2012-03-08 16:38:59 +0000
@@ -724,7 +724,7 @@
 	gtk_widget_set_size_request(GTK_WIDGET (gmi), -1, height + 4);
 
 #if GTK_CHECK_VERSION(3, 0, 0)
-	gtk_widget_set_margin_left (hbox, width + 2 * padding);
+	gtk_widget_set_margin_left (hbox, width + padding);
 #endif
 
 	GdkPixbuf * pixbuf = dbusmenu_menuitem_property_get_image(newitem, INDICATOR_MENUITEM_PROP_ICON);
 
=== modified file 'src/messages-service.c'
--- src/messages-service.c	2012-02-08 20:42:36 +0000
+++ src/messages-service.c	2012-03-08 16:38:59 +0000
@@ -621,6 +621,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) {
+		dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "");
 		dbusmenu_menuitem_child_append(shell, mi);
 	}
 	resort_menu(shell);