indicator-power

Merge lp:~charlesk/indicator-power/lp-1007095 into lp:indicator-power/13.04

  1. lp-1007095
  2. Merge into trunk.13.04
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 160
Merged at revision: 160
Proposed branch: lp:~charlesk/indicator-power/lp-1007095
Merge into: lp:indicator-power/13.04
Diff against target: 12 lines (+2/-1)
1 file modified
src/indicator-power.c (+2/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-power/lp-1007095
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+143138@code.launchpad.net

Description of the change

This is Phillip Susi's patch from lp:~psusi/ubuntu/raring/indicator-power/show-ups, proposed here for trunk

To post a comment you must log in.
lp:~charlesk/indicator-power/lp-1007095 updated
160. By Phillip Susi

merge lp:~psusi/ubuntu/raring/indicator-power/show-ups

Revision history for this message
Lars Karlitski (larsu) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=raring,flavor=armhf/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=raring,flavor=i386/20/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/20//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=raring,flavor=armhf/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=raring,flavor=i386/23/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/23//rebuild/?

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-power.c'
2--- src/indicator-power.c 2012-11-14 10:09:49 +0000
3+++ src/indicator-power.c 2013-01-14 16:23:21 +0000
4@@ -615,7 +615,8 @@
5 {
6 const IndicatorPowerDevice * device = INDICATOR_POWER_DEVICE(l->data);
7
8- if (indicator_power_device_get_kind(device) == UP_DEVICE_KIND_BATTERY)
9+ if (indicator_power_device_get_kind(device) == UP_DEVICE_KIND_BATTERY ||
10+ indicator_power_device_get_kind(device) == UP_DEVICE_KIND_UPS)
11 {
12 ++*total;
13

Subscribers

People subscribed via source and target branches