From 2f09c70274662dc93c99e183db31405a855e785e Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 14 Dec 2009 17:05:53 +0000
Subject: [PATCH] Presentation cleanup - finished for now

---
 .../presentations/lib/messagelistener.py       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 9e9a0047c..31e1a86c2 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -65,15 +65,13 @@ class Controller(object):
             if self.controller.slidenumber > 1:
                 self.controller.goto_slide(self.controller.slidenumber)
 
-    def slide(self, message):
-        log.debug(u'Live = %s, slide' % self.isLive)
-        print "slide ", message
-        if not self.isLive:
-            return
+    def slide(self, slide, live):
+        log.debug(u'Live = %s, slide' % live)
+#        if not isLive:
+#            return
         self.activate()
-        if message:
-            self.controller.goto_slide(message[0] + 1)
-            self.controller.poll_slidenumber(self.isLive)
+        self.controller.goto_slide(int(slide) + 1)
+        self.controller.poll_slidenumber(live)
 
     def first(self, message):
         """
@@ -200,9 +198,9 @@ class MessageListener(object):
     def slide(self, message):
         slide, live = self.splitMessage(message)
         if live:
-            self.liveHandler.activate()
+            self.liveHandler.slide(slide, live)
         else:
-            self.previewHandler.activate()
+            self.previewHandler.slide(slide, live)
 
     def first(self, message):
         if self.isLive: