Adding function get_types to ProxyInfo class
[python-purple] / account.pyx
index d3dbdbf..e562013 100644 (file)
@@ -113,6 +113,146 @@ cdef class Account:
             account.c_purple_account_set_remember_password(self.c_account, value)
     remember_password = property(__get_remember_password, __set_remember_password)
 
+    def _get_protocol_options(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
+
+        if self.c_account == NULL:
+            return None
+
+        po = {}
+
+        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)
+
+            sett = str(<char *> setting)
+
+            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"
+                str_value = account.c_purple_account_get_string(self.c_account, setting, str_value)
+
+                val = str(<char *> str_value)
+
+            elif type == prefs.PURPLE_PREF_INT:
+
+                int_value = accountopt.c_purple_account_option_get_default_int(option)
+                int_value = account.c_purple_account_get_int(self.c_account, setting, int_value)
+
+                val = int(int_value)
+
+            elif type == prefs.PURPLE_PREF_BOOLEAN:
+
+                bool_value = accountopt.c_purple_account_option_get_default_bool(option)
+                bool_value = account.c_purple_account_get_bool(self.c_account, setting, bool_value)
+
+                val = bool(bool_value)
+
+            elif type == prefs.PURPLE_PREF_STRING_LIST:
+
+                str_value = accountopt.c_purple_account_option_get_default_list_value(option)
+                str_value = account.c_purple_account_get_string(self.c_account, setting, str_value)
+
+                val = str(<char *> str_value)
+
+            iter = iter.next
+
+            po[sett] = val
+
+        return po
+
+    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
+        cdef accountopt.PurpleAccountOption *option
+        cdef const_char *label_name
+        cdef const_char *setting
+
+        if self.c_account == NULL:
+            return None
+
+        po = {}
+
+        iter = self.c_prpl_info.protocol_options
+
+        while iter:
+
+            option = <accountopt.PurpleAccountOption *> iter.data
+            label_name = accountopt.c_purple_account_option_get_text(option)
+            setting = accountopt.c_purple_account_option_get_setting(option)
+
+            sett = str(<char *> setting)
+            label = str(<char *> label_name)
+
+            po[sett] = label
+
+        return po
+
+    protocol_labels = property(_get_protocol_labels)
+
     def get_protocol_name(self):
         if self.c_account:
             return account.c_purple_account_get_protocol_name(self.c_account)
@@ -140,64 +280,55 @@ cdef class Account:
     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)):
-                buddies += [buddy.name]
+                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)
+    def new(self, username, protocol_id):
+        cdef account.PurpleAccount *c_account
+        c_account = account.c_purple_account_new(username, protocol_id)
 
-                # Google Talk default domain hackery!
-                if str_value == NULL and str(<char *> label_name) == "Connect server":
-                    str_value = "talk.google.com"
+        if c_account == NULL:
+            return None
 
-                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 (username, protocol_id)
 
-            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_all(self):
+        cdef glib.GList *iter
+        cdef account.PurpleAccount *acc
 
-            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)
+        accounts = []
 
-            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 = account.c_purple_accounts_get_all()
+        while iter:
+            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)
 
+                accounts.append((username, protocol_id))
             iter = iter.next
 
-    def save_into_xml(self):
-        account.c_purple_accounts_add(self.c_account)
+        return accounts
+