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: Danielle Foré
Approved revision: 57
Merged at revision: 58
Proposed branch: lp:~xapantu/wingpanel-indicator-power/trunk
Merge into: lp:~wingpanel-devs/wingpanel-indicator-power/trunk
Diff against target: 23 lines (+3/-0)
2 files modified
src/Services/DBusInterfaces/Device.vala (+2/-0)
src/Services/Device.vala (+1/-0)
To merge this branch: bzr merge lp:~xapantu/wingpanel-indicator-power/trunk
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+264852@code.launchpad.net

Commit message

Partially revert rev 56 to stay compatible with Freya's Upower

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Works for me :D

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Services/DBusInterfaces/Device.vala'
2--- src/Services/DBusInterfaces/Device.vala 2015-07-06 17:13:32 +0000
3+++ src/Services/DBusInterfaces/Device.vala 2015-07-15 14:19:37 +0000
4@@ -38,5 +38,7 @@
5 public abstract HistoryDataPoint[] GetHistory (string type, uint32 timespan, uint32 resolution) throws IOError;
6 public abstract StatisticsDataPoint[] GetStatistics (string type) throws IOError;
7 public abstract void Refresh () throws IOError;
8+
9+ public signal void Changed ();
10 }
11 }
12
13=== modified file 'src/Services/Device.vala'
14--- src/Services/Device.vala 2015-07-06 17:13:32 +0000
15+++ src/Services/Device.vala 2015-07-15 14:19:37 +0000
16@@ -104,6 +104,7 @@
17
18 private void connect_signals () {
19 device.g_properties_changed.connect (update_properties);
20+ device.Changed.connect (update_properties);
21 }
22
23 private void update_properties () {

Subscribers

People subscribed via source and target branches

to all changes: