X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg.py;h=37bd04ca974f2d474982943534b3920c8db3211a;hb=199f6beec9c9bf6eb08446a4c956ff709aef8fa7;hp=ac55e25f4271ae60c300ead1650c5287e88009a8;hpb=76c9a423c497a1b7c2831087e02e6d8dbda5cb58;p=xsetbg.git

diff --git a/xsetbg.py b/xsetbg.py
index ac55e25..37bd04c 100755
--- 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
@@ -26,7 +26,7 @@ import sys
 from time import time
 
 from xsetbg_conf import xsetbg_dir, xsetbg_conf
-from xsetbg_db import xsetbg_db
+from xsetbg_db import xsetbg_db_path
 
 
 def error(error_str, error_code=1):
@@ -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
@@ -193,9 +183,9 @@ def change(force=False):
          xsetbg_db[old_filename_key] = xsetbg_db[filename_key]
       xsetbg_db[filename_key] = image_name
 
-      program_options = ["xli", "-onroot", "-quiet"] + \
-         ["-center", "-border", random.choice(borders), "-zoom", "auto",
-            image_name]
+      program_options = ["xli", "-border", random.choice(borders),
+                         "-center", "-onroot", "-quiet", "-zoom", "auto",
+                         image_name]
 
       rc = subprocess.call(program_options)
       if rc: