openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/songs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/songs/+merge/80765

- fixed a rename error causing the ooo importer not to work
-- 
https://code.launchpad.net/~googol/openlp/songs/+merge/80765
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/songs into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py	2011-09-06 05:47:33 +0000
+++ openlp/plugins/songs/lib/oooimport.py	2011-10-30 21:42:25 +0000
@@ -65,7 +65,7 @@
         if not isinstance(self.importSource, list):
             return
         try:
-            self.start_ooo()
+            self.startOoo()
         except NoConnectException as exc:
             self.logError(
                 self.importSource[0],
@@ -145,7 +145,7 @@
                 process.waitForStarted()
             self.processStarted = True
         except:
-            log.exception("start_ooo_process failed")
+            log.exception("startOooProcess failed")
 
     def openOooFile(self, filepath):
         """
@@ -171,7 +171,7 @@
                 self.importWizard.incrementProgressBar(
                     u'Processing file ' + filepath, 0)
         except AttributeError:
-            log.exception("open_ooo_file failed: %s", url)
+            log.exception("openOooFile failed: %s", url)
         return
 
     def closeOooFile(self):