Use find_and_run_script more thoroughly

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

diff --git a/src/app_power.vala b/src/app_power.vala
index 8fedf3f4e5545ccd44a9e1d5238375f8e2f3c7c6..2e666030553b66e15c05369e4ffe03d9c6c8ccec 100644 (file)
--- a/src/app_power.vala
+++ b/src/app_power.vala
@@ -485,7 +485,7 @@ public class Backlight: zavai.Service
     public void wiggle()
     {
         try {
     public void wiggle()
     {
         try {

-            zavai.config.run_script(zavai.config.homedir + "/display wiggle");
+            zavai.config.find_and_run_script("display", "wiggle");

         } catch (Error e) {
             zavai.log.error("Requesting/releasing resource Display: " + e.message);
         }
         } catch (Error e) {
             zavai.log.error("Requesting/releasing resource Display: " + e.message);
         }


@@ -496,7 +496,7 @@ public class Backlight: zavai.Service
         if (!started)
         {
             try {
         if (!started)
         {
             try {

-                zavai.config.run_script(zavai.config.homedir + "/display lock_off");
+                zavai.config.find_and_run_script("display", "lock_off");

             } catch (GLib.Error e) {
                 zavai.log.error(e.message);
             }
             } catch (GLib.Error e) {
                 zavai.log.error(e.message);
             }


@@ -506,7 +506,7 @@ public class Backlight: zavai.Service
     public void unlock_screen()
     {
         try {
     public void unlock_screen()
     {
         try {

-            zavai.config.run_script(zavai.config.homedir + "/display defaults");
+            zavai.config.find_and_run_script("display", "defaults");

         } catch (GLib.Error e) {
             zavai.log.error(e.message);
         }
         } catch (GLib.Error e) {
             zavai.log.error(e.message);
         }


@@ -516,7 +516,7 @@ public class Backlight: zavai.Service
     {
         if (started) return;
         try {
     {
         if (started) return;
         try {

-            zavai.config.run_script(zavai.config.homedir + "/display lock_on");
+            zavai.config.find_and_run_script("display", "lock_on");

             zavai.log.info("Acquired display");
             base.start();
         } catch (GLib.Error e) {
             zavai.log.info("Acquired display");
             base.start();
         } catch (GLib.Error e) {


@@ -529,7 +529,7 @@ public class Backlight: zavai.Service
     {
         if (!started) return;
         try {
     {
         if (!started) return;
         try {

-            zavai.config.run_script(zavai.config.homedir + "/display defaults");
+            zavai.config.find_and_run_script("display", "defaults");

             zavai.log.info("Released display");
             base.stop();
         } catch (GLib.Error e) {
             zavai.log.info("Released display");
             base.stop();
         } catch (GLib.Error e) {