Orientation update

Use new syntax to connect to D-Bus events, fix a parameter name
and reorder code to align with the Beifahrer version.

diff --git a/src/orientation.vala b/src/orientation.vala
index 1e03ace..c757ff3 100644 (file)
--- a/src/orientation.vala
+++ b/src/orientation.vala
@@ -17,22 +17,25 @@
  */
 
 public class Orientation : Object {
-       public bool portrait;
-       public bool keyboard;
-       public signal void changed ();
-       private DBus.Connection conn;
-       private dynamic DBus.Object mce_request;
-       private dynamic DBus.Object mce_signal;
-       private dynamic DBus.Object hal_slide;
        private const string MCE_SERVICE = "com.nokia.mce";
        private const string MCE_REQUEST_PATH = "/com/nokia/mce/request";
        private const string MCE_SIGNAL_PATH = "/com/nokia/mce/signal";
        private const string MCE_REQUEST_IF = "com.nokia.mce.request";
        private const string MCE_SIGNAL_IF = "com.nokia.mce.signal";
+
        private const string HAL_SERVICE = "org.freedesktop.Hal";
        private const string HAL_SLIDE_PATH = "/org/freedesktop/Hal/devices/platform_slide";
        private const string HAL_DEVICE_IF = "org.freedesktop.Hal.Device";
 
+       public bool portrait;
+       public bool keyboard;
+       private DBus.Connection conn;
+       private dynamic DBus.Object mce_request;
+       private dynamic DBus.Object mce_signal;
+       private dynamic DBus.Object hal_slide;
+
+       public signal void changed ();
+
        construct {
                portrait = false;
                try {
@@ -42,10 +45,10 @@ public class Orientation : Object {
                        mce_enable_accelerometer ();
 
                        mce_signal = conn.get_object (MCE_SERVICE, MCE_SIGNAL_PATH, MCE_SIGNAL_IF);
-                       mce_signal.sig_device_orientation_ind += on_mce_orientation_changed;
+                       mce_signal.sig_device_orientation_ind.connect (on_mce_orientation_changed);
 
                        hal_slide = conn.get_object (HAL_SERVICE, HAL_SLIDE_PATH, HAL_DEVICE_IF);
-                       hal_slide.Condition += on_hal_slide_condition;
+                       hal_slide.Condition.connect (on_hal_slide_condition);
                        bool closed = hal_slide.GetPropertyBoolean ("button.state.value");
                        keyboard = !closed;
                } catch (Error e) {
@@ -61,7 +64,7 @@ public class Orientation : Object {
                on_mce_orientation_changed (mce_request, orientation, stand, face, x, y, z);
        }
 
-       private void on_mce_orientation_changed (dynamic DBus.Object bluez, string orientation,
+       private void on_mce_orientation_changed (dynamic DBus.Object mce, string orientation,
                                                 string stand, string face, int x, int y , int z) {
                portrait = (orientation == "portrait" & !keyboard);
                changed ();