Merge branch 'kirbybase' into develop

1 files changed, 2 insertions, 6 deletions

diff --git a/config.py b/config.py
index 7230285..f3795bb 100644
--- a/config.py
+++ b/config.py
@@ -20,15 +20,11 @@
 import os
 import ConfigParser
 import sys
-
-# Get our reference point. preferably $HOME.
-homedir = os.getenv("HOME")
-if homedir is None:
-    homedir = os.path.dirname(sys.argv[0])
+from util import homedir, confdir
     
 class _Configuration(object):
     def __init__(self, optioncreator):
-        self.filename = os.path.join(os.path.join(homedir, ".4grab"), "config.cfg")
+        self.filename = os.path.join(confdir, "config.cfg")
         self.configparser = ConfigParser.RawConfigParser()
         self.optioncreator = optioncreator