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

diff --git a/account.pyx b/account.pyx
index 7dd484f..bd2eb44 100644
--- a/account.pyx
+++ b/account.pyx
@@ -19,199 +19,151 @@
 
 cimport purple
 
-cdef extern from *:
-    ctypedef char const_char "const char"
+from protocol import Protocol
 
 cdef class Account:
-    """ Account class """
-    cdef account.PurpleAccount *c_account
-    cdef plugin.PurplePlugin *c_plugin
-    cdef prpl.PurplePluginProtocolInfo *c_prpl_info
-    cdef plugin.PurplePluginInfo *c_plugin_info
-    cdef savedstatuses.PurpleSavedStatus *__sstatus
-    cdef ProxyInfo __proxy
-
-    def __init__(self, char *username, char *protocol_id):
-        cdef proxy.PurpleProxyInfo *c_proxyinfo
-        cdef account.PurpleAccount *acc = NULL
-
-        acc = account.c_purple_accounts_find(username, protocol_id)
-        if acc:
-            self.c_account = acc
-            c_proxyinfo = account.c_purple_account_get_proxy_info(self.c_account)
+    """
+    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.c_account = account.c_purple_account_new(username, protocol_id)
-            c_proxyinfo = account.c_purple_account_get_proxy_info(self.c_account)
-            if c_proxyinfo == NULL:
-                c_proxyinfo = proxy.c_purple_proxy_info_new()
-                proxy.c_purple_proxy_info_set_type(c_proxyinfo, proxy.PURPLE_PROXY_NONE)
-                account.c_purple_account_set_proxy_info(self.c_account, c_proxyinfo)
-        self.__proxy = ProxyInfo()
-        self.__proxy.c_proxyinfo = c_proxyinfo
-        acc = NULL
-
-        self.c_plugin = plugin.c_purple_plugins_find_with_id(protocol_id)
-        self.c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(self.c_plugin)
+            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):
-        if self.c_account:
-            return account.c_purple_account_get_username(self.c_account)
+        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 None
-    def __set_username(self, username):
-        if self.c_account:
-            account.c_purple_account_set_username(self.c_account, username)
-    username = property(__get_password, __set_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_password(self):
-        if self.c_account:
-            return account.c_purple_account_get_password(self.c_account)
+        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
     def __set_password(self, password):
-        if self.c_account:
-            account.c_purple_account_set_password(self.c_account, 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):
-        if self.c_account:
-            return account.c_purple_account_get_alias(self.c_account)
+        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.c_account:
-            account.c_purple_account_set_alias(self.c_account, 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):
-        if self.c_account:
-            return account.c_purple_account_get_user_info(self.c_account)
+        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.c_account:
-            account.c_purple_account_set_user_info(self.c_account, user_info)
-    user_info = property(__get_user_info, __set_user_info)
-
-    def __get_protocol_id(self):
-        if self.c_account:
-            return account.c_purple_account_get_protocol_id(self.c_account)
+        if self.__exists:
+            account.purple_account_set_user_info(self._get_structure(), \
+                    user_info)
+            return True
         else:
-            return None
-    def __set_protocol_id(self, protocol_id):
-        if self.c_account:
-            account.c_purple_account_set_protocol_id(self.c_account, protocol_id)
-    protocol_id = property(__get_protocol_id, __set_protocol_id)
+            return False
+    user_info = property(__get_user_info, __set_user_info)
 
     def __get_remember_password(self):
-        if self.c_account:
-            return account.c_purple_account_get_remember_password(self.c_account)
+        if self.__exists:
+            return account.purple_account_get_remember_password( \
+                    self._get_structure())
         else:
             return None
-    def __set_remember_password(self, value):
-        if self.c_account:
-            account.c_purple_account_set_remember_password(self.c_account, value)
-    remember_password = property(__get_remember_password, __set_remember_password)
-
-    def get_protocol_name(self):
-        if self.c_account:
-            return account.c_purple_account_get_protocol_name(self.c_account)
+    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 None
+            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 get_enabled(self, ui):
-        if self.c_account:
-            return account.c_purple_account_get_enabled(self.c_account, ui)
+    def set_protocol_id(self, protocol_id):
+        if self.__exists:
+            self.__protocol._set_protocol_id(protocol_id)
+            return True
         else:
-            return None
+            return False
 
-    def set_enabled(self, ui, value):
-        if self.c_account:
-            account.c_purple_account_set_enabled(self.c_account, ui, value)
-
-    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_proxy(self):
-        return self.__proxy
-    proxy = property(__get_proxy)
-
-    def get_buddies_online(self):
-        cdef glib.GSList *iter
-        cdef blist.PurpleBuddy *buddy
-        cdef char *c_name = NULL
-        cdef char *c_alias = NULL
-        buddies = []
-        iter = blist.c_purple_find_buddies(self.c_account, NULL)
-        while iter:
-            c_name = NULL
-            c_alias = NULL
-            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)):
-                c_name = <char *> blist.c_purple_buddy_get_name(buddy)
-                if c_name == NULL:
-                    name = None
-                else:
-                    name = c_name
-                c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
-                if c_alias == NULL:
-                    alias = None
-                else:
-                    alias = c_alias
-                buddies.append((name, alias))
-            iter = iter.next
-        return buddies
-
-    def get_protocol_options(self):
-        ''' FIXME: It is just a hack, to set the XMPP's options. '''
-        cdef glib.GList *iter
-        cdef accountopt.PurpleAccountOption *option
-        cdef prefs.PurplePrefType type
-        cdef const_char *label_name
-        cdef const_char *str_value
-        cdef const_char *setting
-        cdef int int_value
-        cdef glib.gboolean bool_value
-        iter = self.c_prpl_info.protocol_options
-        while iter:
-            option = <accountopt.PurpleAccountOption *> iter.data
-            type = accountopt.c_purple_account_option_get_type(option)
-            label_name = accountopt.c_purple_account_option_get_text(option)
-            setting = accountopt.c_purple_account_option_get_setting(option)
-            if type == prefs.PURPLE_PREF_STRING:
-                str_value = accountopt.c_purple_account_option_get_default_string(option)
-
-                # Google Talk default domain hackery!
-                if str_value == NULL and str(<char *> label_name) == "Connect server":
-                    str_value = "talk.google.com"
-
-                if self.c_account != NULL:
-                    str_value = account.c_purple_account_get_string(self.c_account, setting, str_value)
-                    account.c_purple_account_set_string(self.c_account, setting, str_value)
-
-            elif type == prefs.PURPLE_PREF_INT:
-                int_value = accountopt.c_purple_account_option_get_default_int(option)
-                if self.c_account != NULL:
-                   int_value = account.c_purple_account_get_int(self.c_account, setting, int_value)
-                   if str(<char *> setting) == "port":
-                        account.c_purple_account_set_int(self.c_account, setting, 443)
-
-            elif type == prefs.PURPLE_PREF_BOOLEAN:
-                bool_value = accountopt.c_purple_account_option_get_default_bool(option)
-                if self.c_account != NULL:
-                    bool_value = account.c_purple_account_get_bool(self.c_account, setting, bool_value)
-                    if str(<char *> setting) == "old_ssl":
-                        account.c_purple_account_set_bool(self.c_account, setting, True)
-
-            elif type == prefs.PURPLE_PREF_STRING_LIST:
-                str_value = accountopt.c_purple_account_option_get_default_list_value(option)
-                if self.c_account != NULL:
-                    str_value = account.c_purple_account_get_string(self.c_account, setting, str_value)
-
-            iter = iter.next
-
-    def save_into_xml(self):
-        account.c_purple_accounts_add(self.c_account)
+    def new(self):
+        if self.__exists:
+            return False
+        else:
+            account.purple_account_new(self.username, self.protocol_id)
+            self.__exists = True
+            return True