Merge lp:~larsu/indicator-power/basic-menu-item into lp:indicator-power/14.04

Proposed by Lars Karlitski on 2014-03-27
Status: Merged
Approved by: Charles Kerr on 2014-03-28
Approved revision: 235
Merged at revision: 238
Proposed branch: lp:~larsu/indicator-power/basic-menu-item
Merge into: lp:indicator-power/14.04
Diff against target: 12 lines (+2/-0)
1 file modified
src/service.c (+2/-0)
To merge this branch: bzr merge lp:~larsu/indicator-power/basic-menu-item
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2014-03-27 Approve on 2014-03-28
PS Jenkins bot (community) continuous-integration Approve on 2014-03-27
Review via email: mp+213036@code.launchpad.net

Commit message

Use com.canonical.indicator.basic menu item for device items

That menu item can handle non-square icons.

Description of the change

Use com.canonical.indicator.basic menu item for device items

That menu item can handle non-square icons.

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

Looks fine.

seb, probably ought to land in sync with lp:~larsu/ido/basic-menu-item

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.c'
2--- src/service.c 2014-03-13 22:27:29 +0000
3+++ src/service.c 2014-03-27 12:19:57 +0000
4@@ -389,6 +389,8 @@
5 item = g_menu_item_new (label, NULL);
6 g_free (label);
7
8+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.basic");
9+
10 if ((icon = indicator_power_device_get_gicon (device)))
11 {
12 GVariant * serialized_icon = g_icon_serialize (icon);

Subscribers

People subscribed via source and target branches