Merge lp:~tintou/switchboard-plug-power/native-naming into lp:~elementary-apps/switchboard-plug-power/trunk

[Corentin Noël]

Use lower_case naming convention in DBus

[lp:~tintou/switchboard-plug-power/native-naming]

411. By Corentin Noël on 2017-03-14

Use lower_case naming convention

=== modified file 'src/Battery.vala'
--- src/Battery.vala	2016-07-04 02:25:39 +0000
+++ src/Battery.vala	2017-03-14 10:24:13 +0000
@@ -33,7 +33,7 @@
         public bool check_present () {
             bool present = false;
             if (laptop) {
-                if (upower.OnBattery || upower_device.IsPresent) {
+                if (upower.on_battery || upower_device.is_present) {
                     present = true;
                 }
             }  
@@ -44,7 +44,7 @@
         private string get_dbus_path (Upower upow) {
             string path = "";
             try {
-                ObjectPath[] devs = upow.EnumerateDevices();
+                ObjectPath[] devs = upow.enumerate_devices();
                 for (int i = 0; i < devs.length; i++) {
                     if (devs[i].contains ("BAT0")) {
                         path = devs[i].to_string();

=== modified file 'src/Interfaces.vala'
--- src/Interfaces.vala	2017-03-14 09:46:39 +0000
+++ src/Interfaces.vala	2017-03-14 10:24:13 +0000
@@ -24,36 +24,31 @@
     [DBus (name = "org.gnome.SettingsDaemon.Power.Screen")]
     interface PowerSettings : GLib.Object {
 #if OLD_GSD
-        public abstract uint GetPercentage () throws IOError;
-        public abstract uint SetPercentage (uint percentage) throws IOError;
+        public abstract uint get_percentage () throws IOError;
+        public abstract uint set_percentage (uint percentage) throws IOError;
 #else
         // use the Brightness property after updateing g-s-d to 3.10 or above
-        public abstract int Brightness {get; set; }
+        public abstract int brightness {get; set; }
 #endif
     }
 
     [DBus (name = "org.freedesktop.UPower.Device")]
     interface UpowerDevice : Object {
-        public signal void Changed ();
-        public abstract void Refresh () throws IOError;
-        public abstract bool Online { owned get; }
-        public abstract bool PowerSupply { owned get; }
-        public abstract bool IsPresent { owned get; }
-        public abstract uint Type { owned get; }
+        public signal void changed ();
+        public abstract void refresh () throws IOError;
+        public abstract bool online { owned get; }
+        public abstract bool power_supply { owned get; }
+        public abstract bool is_present { owned get; }
+        [DBus (name = "Type")]
+        public abstract uint device_type { owned get; }
     }
 
 
     [DBus (name = "org.freedesktop.UPower")]
     interface Upower : Object {
-        public signal void Changed ();
-        public abstract bool OnBattery { owned get; }
-        public abstract bool LowOnBattery { owned get; }
-        public abstract ObjectPath[] EnumerateDevices () throws IOError;
-    }
-
-    [DBus (name = "org.freedesktop.DBus.Properties")]
-    public interface UpowerProperties : Object {
-        public abstract Variant Get (string interface, string propname) throws IOError;
-        public abstract void Set (string interface, string propname, Variant value) throws IOError;
+        public signal void changed ();
+        public abstract bool on_battery { owned get; }
+        public abstract bool low_on_battery { owned get; }
+        public abstract ObjectPath[] enumerate_devices () throws IOError;
     }
 }

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-12-14 19:07:02 +0000
+++ src/Plug.vala	2017-03-14 10:24:13 +0000
@@ -238,7 +238,7 @@
                 scale.hexpand = true;
                 scale.width_request = 480;
 
-                scale.set_value (screen.Brightness);
+                scale.set_value (screen.brightness);
 
                 scale.value_changed.connect (on_scale_value_changed);
                 (screen as DBusProxy).g_properties_changed.connect (on_screen_properties_changed);
@@ -306,14 +306,14 @@
         private void on_scale_value_changed () {
             var val = (int) scale.get_value ();
             (screen as DBusProxy).g_properties_changed.disconnect (on_screen_properties_changed);
-            screen.Brightness = val;
+            screen.brightness = val;
             (screen as DBusProxy).g_properties_changed.connect (on_screen_properties_changed);
         }
         
         private void on_screen_properties_changed (Variant changed_properties, string[] invalidated_properties) {
             var changed_brightness = changed_properties.lookup_value("Brightness", new VariantType("i"));
             if (changed_brightness != null) {
-                var val = screen.Brightness;
+                var val = screen.brightness;
                 scale.value_changed.disconnect (on_scale_value_changed);
                 scale.set_value (val);
                 scale.value_changed.connect (on_scale_value_changed);

=== modified file 'src/PowerSupply.vala'
--- src/PowerSupply.vala	2016-07-04 02:25:39 +0000
+++ src/PowerSupply.vala	2017-03-14 10:24:13 +0000
@@ -35,9 +35,9 @@
             }
 
             try {
-                upower_device.Refresh ();
+                upower_device.refresh ();
 
-                if (upower_device.Online && upower_device.PowerSupply) {
+                if (upower_device.online && upower_device.power_supply) {
                     present = true;
                 }
             } catch (Error e) {
@@ -60,10 +60,10 @@
 
         private void get_upower_ac_device (Upower upow) {
             try {
-                ObjectPath[] devs = upow.EnumerateDevices ();
+                ObjectPath[] devs = upow.enumerate_devices ();
                 for (int i = 0; i < devs.length; i++) {
                     UpowerDevice dev = Bus.get_proxy_sync (BusType.SYSTEM, DBUS_UPOWER_NAME, devs[i], DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
-                    if (dev.Type == LINE_POWER_TYPE) {
+                    if (dev.device_type == LINE_POWER_TYPE) {
                         upower_device = dev;
                         return;
                     }