Fixing Account to get protocol class as parameter

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index 78fac03..915f52f 100644 (file)
--- a/account.pyx
+++ b/account.pyx
@@ -19,27 +19,53 @@
 
 cimport purple
 
-from protocol import Protocol
-
 cdef class Account:
     """
     Account class
+    @param core Purple class instance
     @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.__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
+        else:
+            self.__exists = False
 
     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
@@ -58,18 +84,9 @@ cdef class Account:
             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
@@ -138,15 +155,17 @@ cdef class Account:
         else:
             return False
 
-    def set_protocol_id(self, protocol_id):
+    def set_protocol(self, protocol):
         """
-        Sets the account's protocol ID.
+        Sets the account's protocol.
 
-        @param protocol_id The protocol ID
+        @param protocol A Protocol class instance
         @return True if successful, False if account doesn't exists
         """
-        if self.__exists:
-            self.__protocol._set_protocol_id(protocol_id)
+        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