Rename db_file to xsetbg_db_path

[xsetbg.git] / xsetbg.py

diff --git a/xsetbg.py b/xsetbg.py
index ee9c5f883cdbc521f39d20dc9785b3d8048a361a..b932c81340255e486d37d756a749ea38ffec01e2 100755 (executable)
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -11,7 +11,7 @@ __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-__all__ = ['host', 'port', 'change']
+__all__ = ['change']
 
 
 import anydbm
@@ -92,17 +92,6 @@ if xsetbg_conf.has_option("xsetbg", "min_delay"):
 else:
    min_delay = 3600*24 # 24 hours
 
-# httpd settings
-if xsetbg_conf.has_option("httpd", "host"):
-   host = xsetbg_conf.get("httpd", "host")
-else:
-   host = 'localhost'
-
-if xsetbg_conf.has_option("httpd", "port"):
-   port = xsetbg_conf.getint("httpd", "port")
-else:
-   error("Config must specify a port to listen. Abort.")
-
 
 # DB keys
 timestamp_key = "timestamp"
@@ -153,7 +142,8 @@ if not images:
 def change(force=False):
    # Use the program's file as the lock file:
    # lock it to prevent two processes run in parallel.
-   lock_file = open("xsetbg.py", 'r')
+   lock_file = open(os.path.join(xsetbg_dir, 'xsetbg.py'), 'r')
+
    try:
       flock(lock_file, LOCK_EX|LOCK_NB)
    except IOError: # already locked