openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Phill has proposed merging lp:~phill-ridout/openlp/bug1258634_2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1258634 in OpenLP: "TypeError when saving service from previous versions with notes"
  https://bugs.launchpad.net/openlp/+bug/1258634

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/bug1258634_2.0/+merge/198126

Fix for 1258634 by converting notes to unicode from QString
-- 
https://code.launchpad.net/~phill-ridout/openlp/bug1258634_2.0/+merge/198126
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/bug1258634_2.0 into lp:openlp/2.0.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2013-01-15 21:28:47 +0000
+++ openlp/core/lib/serviceitem.py	2013-12-06 20:32:27 +0000
@@ -317,7 +317,7 @@
         self.add_icon(header[u'icon'])
         self.raw_footer = header[u'footer']
         self.audit = header[u'audit']
-        self.notes = header[u'notes']
+        self.notes = unicode(header[u'notes'])
         self.from_plugin = header[u'from_plugin']
         self.capabilities = header[u'capabilities']
         # Added later so may not be present in older services.