12 files changed, 18 insertions, 18 deletions
diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index e5c455276..9c6d662e0 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -89,7 +89,7 @@ class BypassCaptcha(Addon):
             self.logError(_("Could not send response"), e)
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if "service" in task.data:
             return False
 
diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index 5d04a6481..2fc098473 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -39,7 +39,7 @@ class Captcha9kw(Addon):
     API_URL = "http://www.9kw.eu/index.cgi"
 
 
-    def coreReady(self):
+    def activate(self):
         if self.getConfig("ssl"):
             self.API_URL = self.API_URL.replace("http://", "https://")
 
@@ -164,7 +164,7 @@ class Captcha9kw(Addon):
         task.setResult(result)
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if not task.isTextual() and not task.isPositional():
             return
 
diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index b5e5f34ca..01c5588e3 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -127,7 +127,7 @@ class CaptchaBrotherhood(Addon):
         return res
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if "service" in task.data:
             return False
 
diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index 240f9a5ce..9ab88127a 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -156,7 +156,7 @@ class DeathByCaptcha(Addon):
         return ticket, result
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if "service" in task.data:
             return False
 
diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py
index d4d125b2a..746dcf246 100644
--- a/pyload/plugins/hook/ExpertDecoders.py
+++ b/pyload/plugins/hook/ExpertDecoders.py
@@ -62,7 +62,7 @@ class ExpertDecoders(Addon):
         task.setResult(result)
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if not task.isTextual():
             return False
 
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index 9a9fc0eef..ea914ed23 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -103,7 +103,7 @@ class ImageTyperz(Addon):
         return ticket, result
 
 
-    def newCaptchaTask(self, task):
+    def captchaTask(self, task):
         if "service" in task.data:
             return False
 
diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py
index 41aa434d4..ad3ace2a6 100644
--- a/pyload/plugins/hook/LinkdecrypterCom.py
+++ b/pyload/plugins/hook/LinkdecrypterCom.py
@@ -17,7 +17,7 @@ class LinkdecrypterCom(Addon):
     __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    def coreReady(self):
+    def activate(self):
         try:
             self.loadPatterns()
         except Exception, e:
diff --git a/pyload/plugins/hook/PremiumTo.py b/pyload/plugins/hook/PremiumTo.py
index 31858f8dd..6a4e4a644 100644
--- a/pyload/plugins/hook/PremiumTo.py
+++ b/pyload/plugins/hook/PremiumTo.py
@@ -26,7 +26,7 @@ class PremiumTo(MultiHoster):
         return [x.strip() for x in page.replace("\"", "").split(";")]
 
 
-    def coreReady(self):
+    def activate(self):
         self.account = self.core.accountManager.getAccountPlugin("PremiumTo")
 
         user = self.account.selectAccount()[0]
@@ -35,4 +35,4 @@ class PremiumTo(MultiHoster):
             self.logError(_("Please add your premium.to account first and restart pyLoad"))
             return
 
-        return MultiHoster.coreReady(self)
+        return MultiHoster.activate(self)
diff --git a/pyload/plugins/hook/PremiumizeMe.py b/pyload/plugins/hook/PremiumizeMe.py
index 34f46f6ca..de887999f 100644
--- a/pyload/plugins/hook/PremiumizeMe.py
+++ b/pyload/plugins/hook/PremiumizeMe.py
@@ -42,7 +42,7 @@ class PremiumizeMe(MultiHoster):
         return data['result']['hosterlist']
 
 
-    def coreReady(self):
+    def activate(self):
         # Get account plugin and check if there is a valid account available
         self.account = self.core.accountManager.getAccountPlugin("PremiumizeMe")
         if not self.account.canUse():
@@ -51,4 +51,4 @@ class PremiumizeMe(MultiHoster):
             return
 
         # Run the overwriten core ready which actually enables the multihoster hook
-        return MultiHoster.coreReady(self)
+        return MultiHoster.activate(self)
diff --git a/pyload/plugins/hook/RPNetBiz.py b/pyload/plugins/hook/RPNetBiz.py
index 25355520b..88e091d37 100644
--- a/pyload/plugins/hook/RPNetBiz.py
+++ b/pyload/plugins/hook/RPNetBiz.py
@@ -40,7 +40,7 @@ class RPNetBiz(MultiHoster):
         return hoster_list['hosters']
 
 
-    def coreReady(self):
+    def activate(self):
         # Get account plugin and check if there is a valid account available
         self.account = self.core.accountManager.getAccountPlugin("RPNetBiz")
         if not self.account.canUse():
@@ -49,4 +49,4 @@ class RPNetBiz(MultiHoster):
             return
 
         # Run the overwriten core ready which actually enables the multihoster hook
-        return MultiHoster.coreReady(self)
+        return MultiHoster.activate(self)
diff --git a/pyload/plugins/hook/RehostTo.py b/pyload/plugins/hook/RehostTo.py
index ce1dee59c..3da17ea8f 100644
--- a/pyload/plugins/hook/RehostTo.py
+++ b/pyload/plugins/hook/RehostTo.py
@@ -25,7 +25,7 @@ class RehostTo(MultiHoster):
         return [x.strip() for x in page.replace("\"", "").split(",")]
 
 
-    def coreReady(self):
+    def activate(self):
         self.account = self.core.accountManager.getAccountPlugin("RehostTo")
 
         user = self.account.selectAccount()[0]
@@ -38,4 +38,4 @@ class RehostTo(MultiHoster):
         self.ses = data['ses']
         self.long_ses = data['long_ses']
 
-        return MultiHoster.coreReady(self)
+        return MultiHoster.activate(self)
diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index 698da482f..28cc5f62d 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -44,7 +44,7 @@ class XFileSharingPro(Addon):
         # self.loadPattern()
 
 
-    def coreReady(self):
+    def activate(self):
         self.loadPattern()
 
 
@@ -91,6 +91,6 @@ class XFileSharingPro(Addon):
         dict['re'] = re.compile(dict['pattern'])
 
 
-    def unload(self):
+    def deactivate(self):
         for type in ("hoster", "crypter"):
             self._unload(type, "XFileSharingPro")