X-Git-Url: https://code.delx.au/bg-scripts/blobdiff_plain/7e127c3969ded9ace8f056c5f3e47d070ff17179..ca1afbb8768209a5a7926e54061475737a4e79a4:/bin/randombg.py

diff --git a/bin/randombg.py b/bin/randombg.py
index f31cbb6..8b2edd1 100755
--- a/bin/randombg.py
+++ b/bin/randombg.py
@@ -17,7 +17,7 @@ except ImportError:
 try:
 	# Required libraries
 	import asyncsched
-	import WallChanger
+	import wallchanger
 except ImportError, e:
 	critical("Missing libraries! Exiting...")
 	sys.exit(1)
@@ -193,8 +193,8 @@ class Cycler(object):
 			error("No images were found. Exiting...")
 			sys.exit(1)
 	
-		debug("Initialising RandomBG")
-		self.randombg = WallChanger.RandomBG(options.background_colour, options.permanent)
+		debug("Initialising wallchanger")
+		wallchanger.init(options.background_colour, options.permanent)
 		self.cycle_time = options.cycle_time
 
 		self.task = None
@@ -221,7 +221,7 @@ class Cycler(object):
 	def cmd_reset(self):
 		def next():
 			image = self.filelist.get_next_image()
-			self.randombg.setImage(image)
+			wallchanger.set_image(image)
 			self.task = None
 			self.cmd_reset()
 
@@ -232,17 +232,17 @@ class Cycler(object):
 	
 	def cmd_reload(self):
 		image = self.filelist.get_current_image()
-		self.randombg.setImage(image)
+		wallchanger.set_image(image)
 		self.cmd_reset()
 
 	def cmd_next(self):
 		image = self.filelist.get_next_image()
-		self.randombg.setImage(image)
+		wallchanger.set_image(image)
 		self.cmd_reset()
 	
 	def cmd_prev(self):
 		image = self.filelist.get_prev_image()
-		self.randombg.setImage(image)
+		wallchanger.set_image(image)
 		self.cmd_reset()
 	
 	def cmd_rescan(self):
@@ -280,16 +280,16 @@ class Server(asynchat.async_chat):
 
 
 class Listener(asyncore.dispatcher):
-	def __init__(self, socket_filename, randombg):
+	def __init__(self, socket_filename, cycler):
 		asyncore.dispatcher.__init__(self)
-		self.randombg = randombg
+		self.cycler = cycler
 		self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM)
 		self.bind(socket_filename)
 		self.listen(2) # Backlog = 2
 	
 	def handle_accept(self):
 		conn, addr = self.accept()
-		Server(self.randombg, conn, addr)
+		Server(self.cycler, conn, addr)
 		
 
 def do_server(options, paths):