Merge lp:~raoul-snyman/openlp/bug-1216785-2.0 into lp:openlp/2.0

[Raoul Snyman]

Fix bug #1216785 by casting to unicode before adding to the service.

[Tim Bentley (trb143)]

review: Approve

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2013-06-30 12:14:30 +0000
+++ openlp/core/ui/servicemanager.py	2013-08-26 19:28:22 +0000
@@ -796,7 +796,7 @@
             self.serviceItems[item][u'service_item'].notes)
         if self.serviceNoteForm.exec_():
             self.serviceItems[item][u'service_item'].notes = \
-                self.serviceNoteForm.textEdit.toPlainText()
+                unicode(self.serviceNoteForm.textEdit.toPlainText())
             self.repaintServiceList(item, -1)
             self.setModified()
 

=== modified file 'openlp/core/ui/servicenoteform.py'
--- openlp/core/ui/servicenoteform.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/servicenoteform.py	2013-08-26 19:28:22 +0000
@@ -32,6 +32,7 @@
 from openlp.core.lib import translate, SpellTextEdit
 from openlp.core.lib.ui import create_button_box
 
+
 class ServiceNoteForm(QtGui.QDialog):
     """
     This is the form that is used to edit the verses of the song.