Allow to override icondir to be able to run locally

diff --git a/run b/run
index ae0c221be758da3e491918d8916b61a4f6fc7208..394305469ea3498b42ed3978e4909eb39443ebc2 100755 (executable)
--- a/run
+++ b/run
@@ -2,9 +2,8 @@
 
 ROOT=`dirname $0`
 
-export PYTHONPATH=$ROOT
-export ZAVAI_CONFDIR=$ROOT/conf
-export ZAVAI_PLUGINS=$ROOT/plugins
+#export ZAVAI_CONFDIR=$ROOT/conf
+export ZAVAI_ICONDIR=$ROOT/icons
 
 #$ROOT/src/zavai "$@"
 

diff --git a/src/config.vala b/src/config.vala
index f8c0ba80469dce42a63eb49e7effc9a41d05e3c6..f2413adcc59926fcbf92906f0aa6443a8d289569 100644 (file)
--- a/src/config.vala
+++ b/src/config.vala
@@ -35,11 +35,13 @@ public class Config
         // Set defaults
         version = "0.1";
         homedir = GLib.Environment.get_home_dir() + "/.zavai";
-        icondir = "/usr/share/zavai/icons";
+        icondir = GLib.Environment.get_variable("ZAVAI_ICONDIR");
+        if (icondir == null)
+                icondir = "/usr/share/zavai/icons";
         min_button_height = 80;
-       gprs_apn = "general.t-mobile.uk";
-       gprs_user = "x";
-       gprs_pass = "x";
+        gprs_apn = "general.t-mobile.uk";
+        gprs_user = "x";
+        gprs_pass = "x";
     }
 
 /*