Removed deprecated code from Purple class.

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index 90f09b1..d896dd0 100644 (file)
--- a/account.pyx
+++ b/account.pyx
@@ -19,16 +19,16 @@
 
 cimport purple
 
-from protocol import Protocol
-
 cdef class Account:
     """
     Account class
+    @param core
     @param username
     @param protocol_id
     """
 
-    def __init__(self, username, protocol_id):
+    def __init__(self, core, username, protocol_id):
+        self.__core = core
         self.__username = username
         self.__protocol = Protocol(self, protocol_id)
 
@@ -41,6 +41,32 @@ cdef class Account:
         return account.purple_accounts_find(self.username, \
                 self.protocol_id)
 
+    def __is_connected(self):
+        if self.__exists:
+            return account.purple_account_is_connected(self._get_structure())
+        else:
+            return None
+    is_connected = property(__is_connected)
+
+    def __is_connecting(self):
+        if self.__exists:
+            return account.purple_account_is_connecting(self._get_structure())
+        else:
+            return None
+    is_connecting = property(__is_connecting)
+
+    def __is_disconnected(self):
+        if self.__exists:
+            return account.purple_account_is_disconnected( \
+                    self._get_structure())
+        else:
+            return None
+    is_disconnected = property(__is_disconnected)
+
+    def __get_core(self):
+        return self.__core
+    core = property(__get_core)
+
     def __get_exists(self):
         return self.__exists
     exists = property(__get_exists)
@@ -116,6 +142,14 @@ cdef class Account:
             return None
     remember_password = property(__get_remember_password)
 
+    def __get_enabled(self):
+        if self.__exists:
+            return account.purple_account_get_enabled(self._get_structure(), \
+                    self.core.ui_name)
+        else:
+            return None
+    enabled = property(__get_enabled)
+
     def set_username(self, username):
         """
         Sets the account's username.
@@ -200,6 +234,20 @@ cdef class Account:
         else:
             return False
 
+    def set_enabled(self, value):
+        """
+        Sets wheter or not this account is enabled.
+
+        @param value True if it is enabled, or False otherwise
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_enabled(self._get_structure(), \
+                    self.core.ui_name, bool(value))
+            return True
+        else:
+            return False
+
     def new(self):
         """
         Creates a new account.