openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)

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

Fixed a rename error

http://ci.openlp.org/view/Specific%20Branch/job/OpenLP-Pull_and_Run_Functional_Tests/34/
-- 
https://code.launchpad.net/~googol/openlp/registry/+merge/146692
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/registry into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2013-01-27 20:36:18 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2013-02-05 17:50:28 +0000
@@ -184,7 +184,7 @@
         Load the media files into a combobox.
         """
         self.audioAddFromMediaButton.setVisible(False)
-        for plugin in self.parent().pluginManager.plugins:
+        for plugin in self.parent().plugin_manager.plugins:
             if plugin.name == u'media' and plugin.status == PluginStatus.Active:
                 self.audioAddFromMediaButton.setVisible(True)
                 self.mediaForm.populateFiles(plugin.mediaItem.getList(MediaType.Audio))
@@ -915,4 +915,5 @@
             self._theme_manager = Registry().get(u'theme_manager')
         return self._theme_manager
 
-    theme_manager = property(_get_theme_manager)
\ No newline at end of file
+    theme_manager = property(_get_theme_manager)
+