X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=bd2eb4444f46707cd53ade5015c26a2d61475a08;hp=5a9ecf744c745664782030bb3dc2473e7ea0c85a;hb=90f6e43b25dd3932fcc71a4f7afa5ecfcf2e3dc4;hpb=7cb45fa563b2f0d0e9352373ab0e853188592dcf

diff --git a/account.pyx b/account.pyx
index 5a9ecf7..bd2eb44 100644
--- a/account.pyx
+++ b/account.pyx
@@ -18,57 +18,152 @@
 #
 
 cimport purple
-cimport proxy
+
+from protocol import Protocol
 
 cdef class Account:
-    """ Account class """
-    cdef account.PurpleAccount *__account
-    cdef savedstatuses.PurpleSavedStatus *__sstatus
-
-    def __init__(self, char *username, char *protocol_id):
-        self.__account = account.c_purple_account_new(username, protocol_id)
-
-    def set_password(self, password):
-        account.c_purple_account_set_password(self.__account, password)
-
-    def set_enabled(self, ui, value):
-        account.c_purple_account_set_enabled(self.__account, ui, value)
-
-    def get_acc_username(self):
-        if self.__account:
-            return account.c_purple_account_get_username(self.__account)
-
-    def get_password(self):
-        if self.__account:
-            return account.c_purple_account_get_password(self.__account)
-
-    def set_status(self):
-        self.__sstatus = savedstatuses.c_purple_savedstatus_new(NULL, status.PURPLE_STATUS_AVAILABLE)
-        savedstatuses.c_purple_savedstatus_activate(self.__sstatus)
-
-    def get_buddies_online(self):
-        cdef glib.GSList *iter
-        cdef blist.PurpleBuddy *buddy
-        buddies = []
-        iter = blist.c_purple_find_buddies(self.__account, NULL)
-        while iter:
-            buddy = <blist.PurpleBuddy *> iter.data
-            if <blist.PurpleBuddy *>buddy and \
-                account.c_purple_account_is_connected(blist.c_purple_buddy_get_account(buddy)) and \
-                status.c_purple_presence_is_online(blist.c_purple_buddy_get_presence(buddy)):
-                buddies += [buddy.name]
-            iter = iter.next
-        return buddies
-
-    def get_proxyinfo(self):
-        cdef proxy.PurpleProxyInfo *c_proxyinfo
-        c_proxyinfo = account.c_purple_account_get_proxy_info(self.__account)
-        if c_proxyinfo == NULL:
+    """
+    Account class
+    @param username
+    @param protocol_id
+    """
+
+    def __init__(self, username, protocol_id):
+        self.__username = username
+        self.__protocol = Protocol(self, protocol_id)
+
+        if self._get_structure() == NULL:
+            self.__exists = False
+        else:
+            self.__exists = True
+
+    cdef account.PurpleAccount *_get_structure(self):
+        return account.purple_accounts_find(self.username, \
+                self.protocol_id)
+
+    def __get_exists(self):
+        return self.__exists
+    exists = property(__get_exists)
+
+    def __get_username(self):
+        cdef char *username = NULL
+        if self.__exists:
+            username = <char *> account.purple_account_get_username( \
+                    self._get_structure())
+            if username:
+                return username
+            else:
+                return None
+        else:
+            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_password(self):
+        cdef char *password = NULL
+        if self.__exists:
+            password = <char *> account.purple_account_get_password( \
+                    self._get_structure())
+            if password:
+                return password
+            else:
+                return None
+        else:
             return None
-        cdef ProxyInfo proxyinfo
-        proxyinfo = proxy.ProxyInfo()
-        proxyinfo.c_proxyinfo = c_proxyinfo
-        return proxyinfo
+    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)
+
+    def __get_alias(self):
+        cdef char *alias = NULL
+        if self.__exists:
+            alias = <char *> account.purple_account_get_alias(self._get_structure())
+            if alias:
+                return alias
+            else:
+                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)
+
+    def __get_user_info(self):
+        cdef char *user_info = NULL
+        if self.__exists:
+            user_info = <char *> account.purple_account_get_user_info(self._get_structure())
+            if user_info:
+                return user_info
+            else:
+                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)
+
+    def __get_remember_password(self):
+        if self.__exists:
+            return account.purple_account_get_remember_password( \
+                    self._get_structure())
+        else:
+            return None
+    def __set_remember_password(self, remember_password):
+        if self.__exists:
+            account.purple_account_set_remember_password( \
+                self._get_structure(), remember_password)
+            return True
+        else:
+            return False
+    remember_password = property(__get_remember_password, \
+            __set_remember_password)
+
+    def set_username(self, username):
+        if self.__exists:
+            account.purple_account_set_username(self._get_structure(), \
+                    username)
+            return True
+        else:
+            return False
+
+    def set_protocol_id(self, protocol_id):
+        if self.__exists:
+            self.__protocol._set_protocol_id(protocol_id)
+            return True
+        else:
+            return False
 
-    def set_proxyinfo(self, ProxyInfo proxyinf):
-        account.c_purple_account_set_proxy_info(self.__account, proxyinf.c_proxyinfo)
+    def new(self):
+        if self.__exists:
+            return False
+        else:
+            account.purple_account_new(self.username, self.protocol_id)
+            self.__exists = True
+            return True