openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1014684 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
Related bugs:
  Bug #1014684 in OpenLP: "OpenLP doesn't start on Windows XP"
  https://bugs.launchpad.net/openlp/+bug/1014684

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1014684/+merge/111050

- fixed 1014684 (OpenLP doesn't start on Windows XP)
-- 
https://code.launchpad.net/~googol/openlp/bug-1014684/+merge/111050
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2012-05-29 12:59:11 +0000
+++ openlp/core/ui/firsttimeform.py	2012-06-19 16:11:25 +0000
@@ -64,7 +64,7 @@
             filename = config.get(u'theme_%s' % theme, u'filename')
             screenshot = config.get(u'theme_%s' % theme, u'screenshot')
             urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot),
-                os.path.join(gettempdir(), u'openlp', screenshot))
+                os.path.join(unicode(gettempdir()), u'openlp', screenshot))
             item = QtGui.QListWidgetItem(title, self.parent().themesListWidget)
             item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
             item.setCheckState(QtCore.Qt.Unchecked)
@@ -114,7 +114,7 @@
         Set up display at start of theme edit.
         """
         self.restart()
-        check_directory_exists(os.path.join(gettempdir(), u'openlp'))
+        check_directory_exists(os.path.join(unicode(gettempdir()), u'openlp'))
         self.noInternetFinishButton.setVisible(False)
         # Check if this is a re-run of the wizard.
         self.hasRunWizard = Settings().value(
@@ -304,7 +304,7 @@
                 if item.data(QtCore.Qt.UserRole) == QtCore.QVariant(filename):
                     break
             item.setIcon(build_icon(
-                os.path.join(gettempdir(), u'openlp', screenshot)))
+                os.path.join(unicode(gettempdir()), u'openlp', screenshot)))
 
     def _getFileSize(self, url):
         site = urllib.urlopen(url)

=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py	2012-05-11 12:22:34 +0000
+++ openlp/plugins/bibles/forms/bibleupgradeform.py	2012-06-19 16:11:25 +0000
@@ -71,7 +71,7 @@
         self.suffix = u'.sqlite'
         self.settingsSection = u'bibles'
         self.path = AppLocation.get_section_data_path(self.settingsSection)
-        self.temp_dir = os.path.join(gettempdir(), u'openlp')
+        self.temp_dir = os.path.join(unicode(gettempdir()), u'openlp')
         self.files = self.manager.old_bible_databases
         self.success = {}
         self.newbibles = {}

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2012-06-15 16:03:46 +0000
+++ openlp/plugins/songs/songsplugin.py	2012-06-19 16:11:25 +0000
@@ -233,7 +233,7 @@
         new songs into the database.
         """
         self.onToolsReindexItemTriggered()
-        db_dir = unicode(os.path.join(gettempdir(), u'openlp'))
+        db_dir = unicode(os.path.join(unicode(gettempdir()), u'openlp'))
         if not os.path.exists(db_dir):
             return
         song_dbs = []