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

[Lars Karlitski]

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

That menu item can handle non-square icons.

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

That menu item can handle non-square icons.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/34/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/97/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks fine.

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

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2014-03-13 22:27:29 +0000
+++ src/service.c	2014-03-27 12:19:57 +0000
@@ -389,6 +389,8 @@
     item = g_menu_item_new (label, NULL);
     g_free (label);
 
+    g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.basic");
+
     if ((icon = indicator_power_device_get_gicon (device)))
       {
         GVariant * serialized_icon = g_icon_serialize (icon);