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

[xapantu]

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

[Danielle Foré (danrabbit)]

Works for me :D

=== modified file 'src/Services/DBusInterfaces/Device.vala'
--- src/Services/DBusInterfaces/Device.vala	2015-07-06 17:13:32 +0000
+++ src/Services/DBusInterfaces/Device.vala	2015-07-15 14:19:37 +0000
@@ -38,5 +38,7 @@
 		public abstract HistoryDataPoint[] GetHistory (string type, uint32 timespan, uint32 resolution) throws IOError;
 		public abstract StatisticsDataPoint[] GetStatistics (string type) throws IOError;
 		public abstract void Refresh () throws IOError;
+
+		public signal void Changed ();
 	}
 }
 
=== modified file 'src/Services/Device.vala'
--- src/Services/Device.vala	2015-07-06 17:13:32 +0000
+++ src/Services/Device.vala	2015-07-15 14:19:37 +0000
@@ -104,6 +104,7 @@
 
 	private void connect_signals () {
 		device.g_properties_changed.connect (update_properties);
+		device.Changed.connect (update_properties);
 	}
 
 	private void update_properties () {