clPlugin: get rid of CamelCase.

1 files changed, 8 insertions, 6 deletions

diff --git a/nephilim/plugins/__init__.py b/nephilim/plugins/__init__.py
index e52334f..84aa2e5 100644
--- a/nephilim/plugins/__init__.py
+++ b/nephilim/plugins/__init__.py
@@ -5,13 +5,15 @@ __all__ = ['AlbumCover', 'Filebrowser', 'Library', 'Lyrics', 'Notify', 'PlayCont
            'Playlist', 'Systray']
 
 class Plugins:
-    _plugins = None
-    parent   = None
+    _plugins   = None
+    parent = None
+    mpclient   = None
 
-    def __init__(self, parent):
+    def __init__(self, parent, mpclient):
         """load all modules in the plugins directory."""
         self._plugins = {}
         self.parent   = parent
+        self.mpclient = mpclient
 
         for name in __all__:
             self.init_plugin(name)
@@ -39,7 +41,7 @@ class Plugins:
             logging.error('Failed to initialize plugin %s: %s.'%(name, e))
             return False
 
-        self._plugins[name] = eval('module.%s(self.parent)'%name)
+        self._plugins[name] = eval('module.%s(self.parent, self.mpclient, \'%s\')'%(name, name))
         return True
 
     def load(self, name):
@@ -52,7 +54,7 @@ class Plugins:
 
     def unload(self, name):
         if name in self._plugins:
-            if self._plugins[name].isLoaded():
+            if self._plugins[name].is_loaded():
                 self._plugins[name].unload()
 
     def plugins(self):
@@ -61,6 +63,6 @@ class Plugins:
     def loaded_plugins(self):
         list = []
         for plugin in self._plugins.values():
-            if plugin.isLoaded():
+            if plugin.is_loaded():
                 list.append(plugin)
         return list