Revert "Revert "Split non-ui functions in separate lib""

[gregoa/zavai.git] / src / app_power.vala

diff --git a/src/app_power.vala b/src/app_power.vala
index 33be3e93f4a51fb1fd232015e19723fdab91343b..8fedf3f4e5545ccd44a9e1d5238375f8e2f3c7c6 100644 (file)
--- a/src/app_power.vala
+++ b/src/app_power.vala
@@ -129,7 +129,7 @@ public class Power : zavai.Resource, Object
             }
             */
             try {
-                zavai.app.run_script("pm-suspend");
+                zavai.config.run_script("pm-suspend");
                 done = true;
                 zavai.log.info("Suspend was done with zavai.");
             } catch (Error e) {
@@ -141,7 +141,7 @@ public class Power : zavai.Resource, Object
     {
         try {
             //usage.Shutdown();
-            zavai.app.run_script("shutdown -h now");
+            zavai.config.run_script("shutdown -h now");
         } catch (Error e) {
             zavai.log.error("Shutting down phone: " + e.message);
         }
@@ -150,7 +150,7 @@ public class Power : zavai.Resource, Object
     {
         try {
             //usage.Reboot();
-            zavai.app.run_script("shutdown -r now");
+            zavai.config.run_script("shutdown -r now");
         } catch (Error e) {
             zavai.log.error("Rebooting phone: " + e.message);
         }
@@ -174,8 +174,7 @@ public class Power : zavai.Resource, Object
 
             // FIXME: X won't see events, but it's still generating interrupts,
             // isn't it?
-            int EVIOCGRAB = 0x40044590;
-            if (Posix.ioctl(screen_lock_fd, EVIOCGRAB, locked ? 1 : 0) != 0)
+            if (Posix.ioctl(screen_lock_fd, LinuxInput.Evio.CGRAB, locked ? 1 : 0) != 0)
             {
                 zavai.log.error("Cannot EVIOCGRAB /dev/input/event1");
                 Posix.close(screen_lock_fd);
@@ -486,7 +485,7 @@ public class Backlight: zavai.Service
     public void wiggle()
     {
         try {
-            zavai.app.run_script(zavai.config.homedir + "/display wiggle");
+            zavai.config.run_script(zavai.config.homedir + "/display wiggle");
         } catch (Error e) {
             zavai.log.error("Requesting/releasing resource Display: " + e.message);
         }
@@ -497,7 +496,7 @@ public class Backlight: zavai.Service
         if (!started)
         {
             try {
-                zavai.app.run_script(zavai.config.homedir + "/display lock_off");
+                zavai.config.run_script(zavai.config.homedir + "/display lock_off");
             } catch (GLib.Error e) {
                 zavai.log.error(e.message);
             }
@@ -507,7 +506,7 @@ public class Backlight: zavai.Service
     public void unlock_screen()
     {
         try {
-            zavai.app.run_script(zavai.config.homedir + "/display defaults");
+            zavai.config.run_script(zavai.config.homedir + "/display defaults");
         } catch (GLib.Error e) {
             zavai.log.error(e.message);
         }
@@ -517,7 +516,7 @@ public class Backlight: zavai.Service
     {
         if (started) return;
         try {
-            zavai.app.run_script(zavai.config.homedir + "/display lock_on");
+            zavai.config.run_script(zavai.config.homedir + "/display lock_on");
             zavai.log.info("Acquired display");
             base.start();
         } catch (GLib.Error e) {
@@ -530,7 +529,7 @@ public class Backlight: zavai.Service
     {
         if (!started) return;
         try {
-            zavai.app.run_script(zavai.config.homedir + "/display defaults");
+            zavai.config.run_script(zavai.config.homedir + "/display defaults");
             zavai.log.info("Released display");
             base.stop();
         } catch (GLib.Error e) {