X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=0588ea31be11c12651e2d7a35872e4a3e895b347;hp=16e5dcd6169e7b959af67e83ed43ae3a9681eb7a;hb=60e2bde48e3f6f4f451f1fae7fc0122b6d1e9f72;hpb=f43bb1fee1c9660e1e8f39640926a8ed2ad52715

diff --git a/account.pyx b/account.pyx
index 16e5dcd..0588ea3 100644
--- a/account.pyx
+++ b/account.pyx
@@ -19,27 +19,32 @@
 
 cimport purple
 
-from protocol import Protocol
-
 cdef class Account:
     """
     Account class
     @param username
-    @param protocol_id
+    @param protocol Protocol class instance
+    @param core Purple class instance
     """
 
-    def __init__(self, username, protocol_id):
+    cdef object __username
+    cdef object __protocol
+    cdef object __core
+    cdef object __exists
+
+    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)
+        return account.purple_accounts_find(self.__username, \
+                self.__protocol.id)
 
     def __is_connected(self):
         if self.__exists:
@@ -63,6 +68,10 @@ cdef class Account:
             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)
@@ -80,18 +89,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
@@ -141,7 +141,7 @@ cdef class Account:
     def __get_enabled(self):
         if self.__exists:
             return account.purple_account_get_enabled(self._get_structure(), \
-                    self.core.ui_name)
+                    self.__core.ui_name)
         else:
             return None
     enabled = property(__get_enabled)
@@ -160,15 +160,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.id)
+            self.__protocol = protocol
             return True
         else:
             return False
@@ -239,7 +241,7 @@ cdef class Account:
         """
         if self.__exists:
             account.purple_account_set_enabled(self._get_structure(), \
-                    self.core.ui_name, bool(value))
+                    self.__core.ui_name, bool(value))
             return True
         else:
             return False
@@ -253,7 +255,7 @@ cdef class Account:
         if self.__exists:
             return False
         else:
-            account.purple_account_new(self.username, self.protocol_id)
+            account.purple_account_new(self.__username, self.__protocol.id)
             self.__exists = True
             return True