Fixing Account to get protocol class as parameter

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index bd2eb44..915f52f 100644 (file)
--- a/account.pyx
+++ b/account.pyx
@@ -19,27 +19,53 @@
 
 cimport purple
 
 
 cimport purple
 

-from protocol import Protocol
-

 cdef class Account:
     """
     Account class
 cdef class Account:
     """
     Account class

+    @param core Purple class instance

     @param username
     @param username

-    @param protocol_id
+    @param protocol Protocol class instance

     """
 
     """
 

-    def __init__(self, username, protocol_id):
+    def __init__(self, username, protocol, core):

         self.__username = username
         self.__username = username

-        self.__protocol = Protocol(self, protocol_id)
+        self.__protocol = protocol
+        self.__core = core

 
 

-        if self._get_structure() == NULL:
-            self.__exists = False
-        else:
+        if protocol.exists and self._get_structure() != NULL:

             self.__exists = True
             self.__exists = True

+        else:
+            self.__exists = False

 
     cdef account.PurpleAccount *_get_structure(self):
         return account.purple_accounts_find(self.username, \
 
     cdef account.PurpleAccount *_get_structure(self):
         return account.purple_accounts_find(self.username, \

-                self.protocol_id)
+                self.protocol.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
 
     def __get_exists(self):
         return self.__exists

@@ -58,18 +84,9 @@ cdef class Account:
             return self.__username
     username = property(__get_username)
 
             return self.__username
     username = property(__get_username)
 

-    def __get_protocol_id(self):
-        cdef char *protocol_id = NULL
-        if self.__exists:
-            protocol_id = <char *> account.purple_account_get_protocol_id( \
-                    self._get_structure())
-            if protocol_id:
-                return protocol_id
-            else:
-                return None
-        else:
-            return self.protocol_id
-    protocol_id = property(__get_protocol_id)
+    def __get_protocol(self):
+        return self.protocol
+    protocol = property(__get_protocol)

 
     def __get_password(self):
         cdef char *password = NULL
 
     def __get_password(self):
         cdef char *password = NULL

@@ -82,14 +99,7 @@ cdef class Account:
                 return None
         else:
             return None
                 return None
         else:
             return None

-    def __set_password(self, password):
-        if self.__exists:
-            account.purple_account_set_password(self._get_structure(), \
-                    password)
-            return True
-        else:
-            return False
-    password = property(__get_password, __set_password)
+    password = property(__get_password)

 
     def __get_alias(self):
         cdef char *alias = NULL
 
     def __get_alias(self):
         cdef char *alias = NULL

@@ -101,14 +111,7 @@ cdef class Account:
                 return None
         else:
             return None
                 return None
         else:
             return None

-    def __set_alias(self, alias):
-        if self.__exists:
-            account.purple_account_set_alias(self._get_structure(), \
-                    alias)
-            return True
-        else:
-            return False
-    alias = property(__get_alias, __set_alias)
+    alias = property(__get_alias)

 
     def __get_user_info(self):
         cdef char *user_info = NULL
 
     def __get_user_info(self):
         cdef char *user_info = NULL

@@ -120,14 +123,7 @@ cdef class Account:
                 return None
         else:
             return None
                 return None
         else:
             return None

-    def __set_user_info(self, user_info):
-        if self.__exists:
-            account.purple_account_set_user_info(self._get_structure(), \
-                    user_info)
-            return True
-        else:
-            return False
-    user_info = property(__get_user_info, __set_user_info)
+    user_info = property(__get_user_info)

 
     def __get_remember_password(self):
         if self.__exists:
 
     def __get_remember_password(self):
         if self.__exists:

@@ -135,17 +131,23 @@ cdef class Account:
                     self._get_structure())
         else:
             return None
                     self._get_structure())
         else:
             return None

-    def __set_remember_password(self, remember_password):
+    remember_password = property(__get_remember_password)
+
+    def __get_enabled(self):

         if self.__exists:
         if self.__exists:

-            account.purple_account_set_remember_password( \
-                self._get_structure(), remember_password)
-            return True
+            return account.purple_account_get_enabled(self._get_structure(), \
+                    self.core.ui_name)

         else:
         else:

-            return False
-    remember_password = property(__get_remember_password, \
-            __set_remember_password)
+            return None
+    enabled = property(__get_enabled)

 
     def set_username(self, username):
 
     def set_username(self, username):

+        """
+        Sets the account's username.
+
+        @param username The username
+        @return True if successful, False if account doesn't exists
+        """

         if self.__exists:
             account.purple_account_set_username(self._get_structure(), \
                     username)
         if self.__exists:
             account.purple_account_set_username(self._get_structure(), \
                     username)

@@ -153,17 +155,125 @@ cdef class Account:
         else:
             return False
 
         else:
             return False
 

-    def set_protocol_id(self, protocol_id):
+    def set_protocol(self, protocol):
+        """
+        Sets the account's protocol.
+
+        @param protocol A Protocol class instance
+        @return True if successful, False if account doesn't exists
+        """
+        if protocol.exists and self.__exists:
+            account.purple_account_set_protocol_id(self._get_structure(), \
+                        protocol.protocol_id)
+            self.__protocol = protocol
+            return True
+        else:
+            return False
+
+    def set_password(self, password):
+        """
+        Sets the account's password.
+
+        @param password The password
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_password(self._get_structure(), \
+                    password)
+            return True
+        else:
+            return False
+
+    def set_alias(self, alias):
+        """
+        Sets the account's alias
+
+        @param alias The alias
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_alias(self._get_structure(), \
+                    alias)
+            return True
+        else:
+            return False
+
+    def set_user_info(self, user_info):
+        """
+        Sets the account's user information
+
+        @param user_info The user information
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_user_info(self._get_structure(), \
+                    user_info)
+            return True
+        else:
+            return False
+
+    def set_remember_password(self, remember_password):
+        """
+        Sets whether or not this account should save its password.
+
+        @param remember_password True if should remember the password,
+                                 or False otherwise
+        @return True if successful, False if account doesn't exists
+        """

         if self.__exists:
         if self.__exists:

-            self.__protocol._set_protocol_id(protocol_id)
+            account.purple_account_set_remember_password( \
+                self._get_structure(), remember_password)
+            return True
+        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):
             return True
         else:
             return False
 
     def new(self):

+        """
+        Creates a new account.
+
+        @return True if successful, False if account already exists
+        """

         if self.__exists:
             return False
         else:
             account.purple_account_new(self.username, self.protocol_id)
             self.__exists = True
             return True
         if self.__exists:
             return False
         else:
             account.purple_account_new(self.username, self.protocol_id)
             self.__exists = True
             return True

+
+    def connect(self):
+        """
+        Connects to an account.
+
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_connect(self._get_structure())
+            return True
+        else:
+            return False
+
+    def disconnect(self):
+        """
+        Disconnects from an account.
+
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_disconnect(self._get_structure())
+            return True
+        else:
+            return False