X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=fe27e58b1bc39638515bdd7b0a0e2d7f67a4d824;hp=97374eaa6ed7f7aa9ae9ab6c1a47782ae95311ec;hb=3884b9d3f22588784501bde1734107aeb4ff0841;hpb=3642aa81f988d2880a7b08db680200697ec2df3d

diff --git a/account.pyx b/account.pyx
index 97374ea..fe27e58 100644
--- a/account.pyx
+++ b/account.pyx
@@ -177,7 +177,53 @@ cdef class Account:
 
         return po
 
-    protocol_options = property(_get_protocol_options)
+    def _set_protocol_options(self, po):
+        cdef glib.GList *iter
+        cdef accountopt.PurpleAccountOption *option
+        cdef prefs.PurplePrefType type
+        cdef const_char *str_value
+        cdef const_char *setting
+        cdef int int_value
+        cdef glib.gboolean bool_value
+
+        if self.c_account == NULL:
+            return
+
+        po = {}
+
+        iter = self.c_prpl_info.protocol_options
+
+        while iter:
+
+            option = <accountopt.PurpleAccountOption *> iter.data
+            type = accountopt.c_purple_account_option_get_type(option)
+            setting = accountopt.c_purple_account_option_get_setting(option)
+
+            sett = str(<char *> setting)
+
+            if type == prefs.PURPLE_PREF_STRING:
+
+                str_value = <char *> po[sett]
+                account.c_purple_account_set_string(self.c_account, setting, str_value)
+
+            elif type == prefs.PURPLE_PREF_INT:
+
+                int_value = int(po[sett])
+                account.c_purple_account_set_int(self.c_account, setting, int_value)
+
+            elif type == prefs.PURPLE_PREF_BOOLEAN:
+
+                bool_value = bool(po[sett])
+                account.c_purple_account_set_bool(self.c_account, setting, bool_value)
+
+            elif type == prefs.PURPLE_PREF_STRING_LIST:
+
+                str_value = <char *> po[sett]
+                account.c_purple_account_set_string(self.c_account, setting, str_value)
+
+            iter = iter.next
+
+    protocol_options = property(_get_protocol_options, _set_protocol_options)
 
     def _get_protocol_labels(self):
         cdef glib.GList *iter
@@ -259,53 +305,49 @@ cdef class Account:
             iter = iter.next
         return buddies
 
-    def get_protocol_options(self):
-        ''' FIXME: It is just a hack, to set the XMPP's options. '''
+    def new(self, username, protocol_id):
+        cdef account.PurpleAccount *c_account
+        c_account = account.c_purple_account_new(username, protocol_id)
+
+        if c_account == NULL:
+            return None
+
+        return (username, protocol_id)
+
+    def get_all(self):
         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
+        cdef account.PurpleAccount *acc
+
+        accounts = []
+
+        iter = account.c_purple_accounts_get_all()
         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)
+            acc = <account.PurpleAccount *> iter.data
+            if <account.PurpleAccount *>acc:
+                username = account.c_purple_account_get_username(acc)
+                protocol_id = account.c_purple_account_get_protocol_id(acc)
 
-                # Google Talk default domain hackery!
-                if str_value == NULL and str(<char *> label_name) == "Connect server":
-                    str_value = "talk.google.com"
+                accounts.append((username, protocol_id))
+            iter = iter.next
 
-                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)
+        return accounts
 
-            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)
+    def get_password(self, acc):
+        ''' @param acc Tuple (username, protocol id) '''
+        cdef account.PurpleAccount *c_account
 
-            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)
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            return account.c_purple_account_get_password(c_account)
+        else:
+            return None
 
-            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)
+    def set_password(self, acc, password):
+        ''' @param acc Tuple (username, protocol id) '''
+        ''' @param password The account's password '''
+        cdef account.PurpleAccount *c_account
 
-            iter = iter.next
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            account.c_purple_account_set_password(c_account, password)
 
-    def save_into_xml(self):
-        account.c_purple_accounts_add(self.c_account)