From 411a60c6c5f689d03cfc6b83d029c1248cafd291 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 4 Jan 2011 18:04:55 +0200 Subject: [PATCH 1/2] Fix for bug #697271 --- openlp/plugins/songs/forms/songmaintenanceform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index 0364a4df4..eda8b6170 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -109,7 +109,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): author_name = QtGui.QListWidgetItem(author.display_name) else: author_name = QtGui.QListWidgetItem( - u' '.join(author.first_name, author.last_name)) + u' '.join([author.first_name, author.last_name])) author_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(author.id)) self.AuthorsListWidget.addItem(author_name) if self.AuthorsListWidget.count() == 0: From 85c6ba2ee49944ccdeebd070b9e8ef83600baf29 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 4 Jan 2011 19:26:37 +0200 Subject: [PATCH 2/2] Fix for bug #696979 --- openlp/core/ui/servicemanager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 8f4e17a0c..8e98e0365 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -367,7 +367,7 @@ class ServiceManager(QtGui.QWidget): translate('OpenLP.ServiceManager', 'Open File'), SettingsManager.get_last_dir(self.parent.serviceSettingsSection), translate('OpenLP.ServiceManager', - 'OpenLP Service Files (*.osz) (*.osz)'))) + 'OpenLP Service Files (*.osz)'))) if not fileName: return False SettingsManager.set_last_dir(self.parent.serviceSettingsSection, @@ -457,7 +457,7 @@ class ServiceManager(QtGui.QWidget): translate('OpenLP.ServiceManager', 'Save Service'), SettingsManager.get_last_dir(self.parent.serviceSettingsSection), translate('OpenLP.ServiceManager', - 'OpenLP Service Files (*.osz) (*.osz)'))) + 'OpenLP Service Files (*.osz)'))) if not fileName: return False if os.path.splitext(fileName)[1] == u'':