From 16924808bd2d854b25f91f786c75eb3ca664e67d Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Mon, 26 Jul 2010 21:31:05 +0100
Subject: [PATCH] Fixes and cleanups

---
 openlp/core/ui/maindisplay.py       |  8 ++++----
 openlp/plugins/bibles/lib/common.py | 14 ++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index ee6336a93..853026d35 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -92,12 +92,12 @@ class DisplayManager(QtGui.QWidget):
         self.videoDisplay.mediaHide(message)
         self.mainDisplay.hideDisplay(message)
 
-    def showDisplay(self, message):
+    def showDisplay(self):
         """
         Hide the output displays
         """
-        self.videoDisplay.mediaShow(message)
-        self.mainDisplay.showDisplay(message)
+        self.videoDisplay.mediaShow()
+        self.mainDisplay.showDisplay()
 
     def addAlert(self, alertMessage, location):
         """
@@ -623,7 +623,7 @@ class VideoDisplay(Phonon.VideoWidget):
         self.hidden = True
         self.setVisible(False)
 
-    def mediaShow(self, message=''):
+    def mediaShow(self):
         """
         Show the video display if it was already hidden
         """
diff --git a/openlp/plugins/bibles/lib/common.py b/openlp/plugins/bibles/lib/common.py
index cf7d9727a..5308495a3 100644
--- a/openlp/plugins/bibles/lib/common.py
+++ b/openlp/plugins/bibles/lib/common.py
@@ -64,7 +64,7 @@ def parse_reference(reference):
         to_verse = match.group(5)
         if int(match.group(2)) == int(match.group(4)):
             reference_list.append(
-                (match.group(1), int(match.group(2)), from_verse, to_verse)
+                (book, int(match.group(2)), from_verse, to_verse)
             )
         else:
             if int(match.group(2)) > int(match.group(4)):
@@ -75,17 +75,11 @@ def parse_reference(reference):
                 to_chapter = int(match.group(4))
             for chapter in xrange(from_chapter, to_chapter + 1):
                 if chapter == from_chapter:
-                    reference_list.append(
-                        (match.group(1), chapter, from_verse, -1)
-                    )
+                    reference_list.append((book, chapter, from_verse, -1))
                 elif chapter == to_chapter:
-                    reference_list.append(
-                        (match.group(1), chapter, 1, to_verse)
-                    )
+                    reference_list.append((book, chapter, 1, to_verse))
                 else:
-                    reference_list.append(
-                        (match.group(1), chapter, 1, -1)
-                    )
+                    reference_list.append((book, chapter, 1, -1))
     else:
         match = only_verses.match(reference)
         if match: