From d7ef6d5f41fc986ec7445632dd6a86804abdcdf0 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sun, 28 Mar 2010 22:57:54 +0100
Subject: [PATCH 1/2] Cleanups

---
 openlp/core/ui/__init__.py                      | 2 +-
 openlp/plugins/bibles/forms/importwizardform.py | 3 +--
 openlp/plugins/images/lib/mediaitem.py          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 3865ec80f..21f41ae7c 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -43,4 +43,4 @@ from mainwindow import MainWindow
 
 __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
     'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
-    'AmendThemeForm', 'MediaDockManager', 'ServiceItemNoteForm']
\ No newline at end of file
+    'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm']
diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py
index a803b7481..a717a4f44 100644
--- a/openlp/plugins/bibles/forms/importwizardform.py
+++ b/openlp/plugins/bibles/forms/importwizardform.py
@@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
 
 from bibleimportwizard import Ui_BibleImportWizard
 from openlp.core.lib import Receiver
-from openlp.core.utils import AppLocation, variant_to_unicode, string_to_unicode
+from openlp.core.utils import AppLocation, variant_to_unicode
 from openlp.plugins.bibles.lib.manager import BibleFormat
 
 log = logging.getLogger(__name__)
@@ -425,4 +425,3 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         self.finishButton.setVisible(True)
         self.cancelButton.setVisible(False)
         Receiver.send_message(u'process_events')
-
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index f3d09f5e3..297a01a73 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -28,7 +28,7 @@ import os
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
-contextMenuAction, contextMenuSeparator
+    contextMenuAction
 
 log = logging.getLogger(__name__)
 

From ab9b72dfb55931f6856a1bd4e80d4a80bfccf6f5 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Tue, 30 Mar 2010 09:05:24 +0200
Subject: [PATCH 2/2] Fixed a broken import.

---
 openlp/core/ui/servicenoteform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py
index 112a7d9a3..6dfdf0b03 100644
--- a/openlp/core/ui/servicenoteform.py
+++ b/openlp/core/ui/servicenoteform.py
@@ -24,7 +24,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from serviceitemdialog import Ui_ServiceNoteEdit
+from servicenotedialog import Ui_ServiceNoteEdit
 
 class ServiceNoteForm(QtGui.QDialog, Ui_ServiceNoteEdit):
     """