11 files changed, 14 insertions, 14 deletions
diff --git a/pyload/plugins/addon/Checksum.py b/pyload/plugins/addon/Checksum.py
index adf542197..1b9941f4b 100644
--- a/pyload/plugins/addon/Checksum.py
+++ b/pyload/plugins/addon/Checksum.py
@@ -63,7 +63,7 @@ class Checksum(Addon):
                'default': r'^(?P<hash>[0-9A-Fa-f]+)\s+\*?(?P<name>.+)$'}
 
 
-    def coreReady(self):
+    def activate(self):
         if not self.getConfig("check_checksum"):
             self.logInfo(_("Checksum validation is disabled in plugin configuration"))
 
diff --git a/pyload/plugins/addon/ClickAndLoad.py b/pyload/plugins/addon/ClickAndLoad.py
index 3da2b2220..490837f65 100644
--- a/pyload/plugins/addon/ClickAndLoad.py
+++ b/pyload/plugins/addon/ClickAndLoad.py
@@ -37,7 +37,7 @@ class ClickAndLoad(Addon):
         self.interval = 300
 
 
-    def coreReady(self):
+    def activate(self):
         self.initPeriodical()
 
 
diff --git a/pyload/plugins/addon/DeleteFinished.py b/pyload/plugins/addon/DeleteFinished.py
index 327b63f4c..5450a8ee2 100644
--- a/pyload/plugins/addon/DeleteFinished.py
+++ b/pyload/plugins/addon/DeleteFinished.py
@@ -38,11 +38,11 @@ class DeleteFinished(Addon):
             self.initPeriodical()
 
 
-    def unload(self):
+    def deactivate(self):
         self.removeEvent('packageFinished', self.wakeup)
 
 
-    def coreReady(self):
+    def activate(self):
         self.info = {'sleep': True}
         interval = self.getConfig('interval')
         self.pluginConfigChanged(self.__name, 'interval', interval)
diff --git a/pyload/plugins/addon/DownloadScheduler.py b/pyload/plugins/addon/DownloadScheduler.py
index 5adbdc33e..95cede509 100644
--- a/pyload/plugins/addon/DownloadScheduler.py
+++ b/pyload/plugins/addon/DownloadScheduler.py
@@ -25,7 +25,7 @@ class DownloadScheduler(Addon):
         self.cb = None  #: callback to scheduler job; will be by removed AddonManager when addon unloaded
 
 
-    def coreReady(self):
+    def activate(self):
         self.updateSchedule()
 
 
diff --git a/pyload/plugins/addon/HotFolder.py b/pyload/plugins/addon/HotFolder.py
index 61e1acf81..297a06c5a 100644
--- a/pyload/plugins/addon/HotFolder.py
+++ b/pyload/plugins/addon/HotFolder.py
@@ -31,7 +31,7 @@ class HotFolder(Addon):
         self.interval = 10
 
 
-    def coreReady(self):
+    def activate(self):
         self.initPeriodical()
 
 
diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py
index 3ac018094..e7a905bf7 100644
--- a/pyload/plugins/addon/IRCInterface.py
+++ b/pyload/plugins/addon/IRCInterface.py
@@ -44,7 +44,7 @@ class IRCInterface(Thread, Addon):
         self.setDaemon(True)
 
 
-    def coreReady(self):
+    def activate(self):
         self.abort = False
         self.more = []
         self.new_package = {}
@@ -69,7 +69,7 @@ class IRCInterface(Thread, Addon):
             pass
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if self.getConfig("captcha") and task.isTextual():
             task.handler.append(self)
             task.setWaiting(60)
diff --git a/pyload/plugins/addon/MultiHome.py b/pyload/plugins/addon/MultiHome.py
index d9cc3fd6d..f9c9e1cef 100644
--- a/pyload/plugins/addon/MultiHome.py
+++ b/pyload/plugins/addon/MultiHome.py
@@ -37,7 +37,7 @@ class MultiHome(Addon):
             self.interfaces.append(Interface(interface))
 
 
-    def coreReady(self):
+    def activate(self):
         requestFactory = self.core.requestFactory
         oldGetRequest = requestFactory.getRequest
 
diff --git a/pyload/plugins/addon/RestartFailed.py b/pyload/plugins/addon/RestartFailed.py
index caf69869b..ffb305e71 100644
--- a/pyload/plugins/addon/RestartFailed.py
+++ b/pyload/plugins/addon/RestartFailed.py
@@ -41,5 +41,5 @@ class RestartFailed(Addon):
         self.interval = 0
 
 
-    def coreReady(self):
+    def activate(self):
         self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval"))
diff --git a/pyload/plugins/addon/UpdateManager.py b/pyload/plugins/addon/UpdateManager.py
index 18b96256b..05197f15d 100644
--- a/pyload/plugins/addon/UpdateManager.py
+++ b/pyload/plugins/addon/UpdateManager.py
@@ -54,13 +54,13 @@ class UpdateManager(Addon):
                 self.periodical2()
 
 
-    def coreReady(self):
+    def activate(self):
         self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval"))
         x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins"))
         self.core.scheduler.addJob(10, x, threaded=False)
 
 
-    def unload(self):
+    def deactivate(self):
         self.pluginConfigChanged(self.__name, "reloadplugins", False)
 
 
diff --git a/pyload/plugins/addon/WindowsPhoneToastNotify.py b/pyload/plugins/addon/WindowsPhoneToastNotify.py
index 6b7c85980..b12ed96d1 100644
--- a/pyload/plugins/addon/WindowsPhoneToastNotify.py
+++ b/pyload/plugins/addon/WindowsPhoneToastNotify.py
@@ -44,7 +44,7 @@ class WindowsPhoneToastNotify(Addon):
         self.setStorage("LAST_NOTIFY", time.time())
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if not self.getConfig("pushId") or not self.getConfig("pushUrl"):
             return False
 
diff --git a/pyload/plugins/addon/XMPPInterface.py b/pyload/plugins/addon/XMPPInterface.py
index d634d3f9f..51e904008 100644
--- a/pyload/plugins/addon/XMPPInterface.py
+++ b/pyload/plugins/addon/XMPPInterface.py
@@ -59,7 +59,7 @@ class XMPPInterface(IRCInterface, JabberClient):
         ]
 
 
-    def coreReady(self):
+    def activate(self):
         self.new_package = {}
 
         self.start()