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

Proposed by Lars Karlitski on 2012-03-08
Status: Merged
Approved by: Ted Gould on 2012-03-08
Approved revision: 254
Merged at revision: 254
Proposed branch: lp:~larsu/indicator-messages/fix-939953
Merge into: lp:indicator-messages/0.3
Diff against target: 24 lines (+2/-1)
2 files modified
src/indicator-messages.c (+1/-1)
src/messages-service.c (+1/-0)
To merge this branch: bzr merge lp:~larsu/indicator-messages/fix-939953
Reviewer Review Type Date Requested Status
Ted Gould (community) 2012-03-08 Approve on 2012-03-08
Review via email: mp+96611@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Ted Gould (ted) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-messages.c'
2--- src/indicator-messages.c 2012-02-10 21:42:43 +0000
3+++ src/indicator-messages.c 2012-03-08 16:38:59 +0000
4@@ -724,7 +724,7 @@
5 gtk_widget_set_size_request(GTK_WIDGET (gmi), -1, height + 4);
6
7 #if GTK_CHECK_VERSION(3, 0, 0)
8- gtk_widget_set_margin_left (hbox, width + 2 * padding);
9+ gtk_widget_set_margin_left (hbox, width + padding);
10 #endif
11
12 GdkPixbuf * pixbuf = dbusmenu_menuitem_property_get_image(newitem, INDICATOR_MENUITEM_PROP_ICON);
13
14=== modified file 'src/messages-service.c'
15--- src/messages-service.c 2012-02-08 20:42:36 +0000
16+++ src/messages-service.c 2012-03-08 16:38:59 +0000
17@@ -621,6 +621,7 @@
18 g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none");
19 DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data);
20 if (mi != NULL) {
21+ dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "");
22 dbusmenu_menuitem_child_append(shell, mi);
23 }
24 resort_menu(shell);

Subscribers

People subscribed via source and target branches