Wingpanel Power Indicator

Merge lp:~xapantu/wingpanel-indicator-power/trunk into lp:~wingpanel-devs/wingpanel-indicator-power/trunk

  1. trunk
  2. Merge into trunk
Proposed by xapantu
Status: Merged
Approved by: Marcus Wichelmann
Approved revision: no longer in the source branch.
Merged at revision: 45
Proposed branch: lp:~xapantu/wingpanel-indicator-power/trunk
Merge into: lp:~wingpanel-devs/wingpanel-indicator-power/trunk
Diff against target: 37 lines (+0/-6)
1 file modified
src/Services/Device.vala (+0/-6)
To merge this branch: bzr merge lp:~xapantu/wingpanel-indicator-power/trunk
Reviewer Review Type Date Requested Status
Marcus Wichelmann (community) Approve
Review via email: mp+261763@code.launchpad.net

Commit message

Remove properties not available in newer upower releases.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

Commented out code should not be in trunk. Unless it's well-documented, maybe.

lp:~xapantu/wingpanel-indicator-power/trunk updated
43. By Launchpad Translations on behalf of wingpanel-devs

Launchpad automatic translations update.

Revision history for this message
xapantu (xapantu) wrote :

These are properties that are available, but which are not in newer version of upower, but maybe they will be cherry picked from the master later (I highly doubt that), that's why I let the code.

I removed it now.

Revision history for this message
Marcus Wichelmann (l-admin-3) wrote :

Looks good and causes no compiler or runtime errors. Thank you! ;)

review: Approve
lp:~xapantu/wingpanel-indicator-power/trunk updated
44. By Launchpad Translations on behalf of wingpanel-devs

Launchpad automatic translations update.

45. By xapantu

Remove properties not available in newer upower releases.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Services/Device.vala'
2--- src/Services/Device.vala 2015-05-24 11:45:19 +0000
3+++ src/Services/Device.vala 2015-06-12 16:40:57 +0000
4@@ -55,7 +55,6 @@
5 public bool is_rechargeable { get; private set; }
6 public bool online { get; private set; }
7 public bool power_supply { get; private set; }
8- public bool recall_notice { get; private set; }
9 public double capacity { get; private set; }
10 public double energy { get; private set; }
11 public double energy_empty { get; private set; }
12@@ -70,8 +69,6 @@
13 public int64 time_to_full { get; private set; }
14 public string model { get; private set; }
15 public string native_path { get; private set; }
16- public string recall_url { get; private set; }
17- public string recall_vendor { get; private set; }
18 public string serial { get; private set; }
19 public string vendor { get; private set; }
20 public uint32 state { get; private set; }
21@@ -117,7 +114,6 @@
22 is_rechargeable = device_properties.Get (device_path, "IsRechargeable").get_boolean ();
23 online = device_properties.Get (device_path, "Online").get_boolean ();
24 power_supply = device_properties.Get (device_path, "PowerSupply").get_boolean ();
25- recall_notice = device_properties.Get (device_path, "RecallNotice").get_boolean ();
26 capacity = device_properties.Get (device_path, "Capacity").get_double ();
27 energy = device_properties.Get (device_path, "Energy").get_double ();
28 energy_empty = device_properties.Get (device_path, "EnergyEmpty").get_double ();
29@@ -132,8 +128,6 @@
30 time_to_full = device_properties.Get (device_path, "TimeToFull").get_int64 ();
31 model = device_properties.Get (device_path, "Model").get_string ();
32 native_path = device_properties.Get (device_path, "NativePath").get_string ();
33- recall_url = device_properties.Get (device_path, "RecallUrl").get_string ();
34- recall_vendor = device_properties.Get (device_path, "RecallVendor").get_string ();
35 serial = device_properties.Get (device_path, "Serial").get_string ();
36 vendor = device_properties.Get (device_path, "Vendor").get_string ();
37 state = device_properties.Get (device_path, "State").get_uint32 ();

Subscribers

People subscribed via source and target branches

to all changes: