From 7ba44af92a4233de02f44b10bebc21ab6cc97941 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 11 Jun 2011 08:04:21 +0100
Subject: [PATCH 1/2] Fix parentage bug

Fixes: https://launchpad.net/bugs/794380
---
 openlp/core/lib/mediamanageritem.py    | 2 +-
 openlp/plugins/bibles/lib/mediaitem.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index e6083240e..268b383d4 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -90,7 +90,7 @@ class MediaManagerItem(QtGui.QWidget):
         """
         Constructor to create the media manager item.
         """
-        QtGui.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self)
         self.hide()
         self.whitespace = re.compile(r'[\W_]+', re.UNICODE)
         self.plugin = plugin
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index d94368f52..5209461df 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -683,17 +683,17 @@ class BibleMediaItem(MediaManagerItem):
                         verse.book.book_reference_id)
                     if not db_book:
                         log.debug(u'Passage "%s %d:%d" not found in Second '
-                            u'Bible' % (verse.book.name, verse.chapter, 
+                            u'Bible' % (verse.book.name, verse.chapter,
                             verse.verse))
                         passage_not_found = True
                         count += 1
                         continue
                     new_search_results.append(verse)
-                    text.append((verse.book.book_reference_id, verse.chapter, 
+                    text.append((verse.book.book_reference_id, verse.chapter,
                         verse.verse, verse.verse))
                 if passage_not_found:
-                    QtGui.QMessageBox.information(self, 
-                        translate('BiblePlugin.MediaItem', 'Information'), 
+                    QtGui.QMessageBox.information(self,
+                        translate('BiblePlugin.MediaItem', 'Information'),
                         unicode(translate('BiblePlugin.MediaItem',
                         'The second Bibles does not contain all the verses '
                         'that are in the main Bible. Only verses found in both '

From 59dffdf3882f1d8a8c4b49fdd1a2397828561fe2 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 11 Jun 2011 08:07:32 +0100
Subject: [PATCH 2/2] Remove deprecated entries

---
 resources/openlp.desktop | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/openlp.desktop b/resources/openlp.desktop
index 07398ede8..b17cbaf96 100755
--- a/resources/openlp.desktop
+++ b/resources/openlp.desktop
@@ -2,7 +2,6 @@
 Categories=AudioVideo;
 Comment[de]=
 Comment=
-Encoding=UTF-8
 Exec=openlp %F
 GenericName[de]=Church lyrics projection
 GenericName=Church lyrics projection
@@ -13,7 +12,6 @@ Name=OpenLP
 Path=
 StartupNotify=true
 Terminal=false
-TerminalOptions=
 Type=Application
 X-DBUS-ServiceName=
 X-DBUS-StartupType=