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

[xapantu]

Use a standard g_properties_changed in the dbus device

Use a standard g_properties_changed in the dbus device. At least it is working in newer upower releases.

The current indicator was not working with upower 0.99.3 on Archlinux.

[Marcus Wichelmann (l-admin-3)]

review: Approve (code style)

[Marcus Wichelmann (l-admin-3)]

Just works! :)

review: Approve (testing)

=== modified file 'src/Services/DBusInterfaces/Device.vala'
--- src/Services/DBusInterfaces/Device.vala	2015-05-23 21:10:50 +0000
+++ src/Services/DBusInterfaces/Device.vala	2015-07-06 17:16:00 +0000
@@ -34,11 +34,9 @@
 	}
 
 	[DBus (name = "org.freedesktop.UPower.Device")]
-	public interface Device : Object {
+	public interface Device : DBusProxy {
 		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-06-12 16:40:50 +0000
+++ src/Services/Device.vala	2015-07-06 17:16:00 +0000
@@ -103,7 +103,7 @@
 	}
 
 	private void connect_signals () {
-		device.Changed.connect (update_properties);
+		device.g_properties_changed.connect (update_properties);
 	}
 
 	private void update_properties () {