Improves calls to set proxy's options of the Account

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index 503a87c..80b0b0e 100644 (file)
--- a/account.pyx
+++ b/account.pyx
@@ -17,20 +17,34 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 

-cimport glib
+cimport purple

 
 

-cimport account
-cimport blist
-cimport savedstatuses
-cimport status
+cdef extern from *:
+    ctypedef char const_char "const char"

 
 cdef class Account:
     """ Account class """
     cdef account.PurpleAccount *__account
 
 cdef class Account:
     """ Account class """
     cdef account.PurpleAccount *__account

+    cdef plugin.PurplePlugin *c_plugin
+    cdef prpl.PurplePluginProtocolInfo *c_prpl_info
+    cdef plugin.PurplePluginInfo *c_plugin_info

     cdef savedstatuses.PurpleSavedStatus *__sstatus
     cdef savedstatuses.PurpleSavedStatus *__sstatus

+    cdef ProxyInfo __proxy

 
     def __init__(self, char *username, char *protocol_id):
 
     def __init__(self, char *username, char *protocol_id):

+        cdef proxy.PurpleProxyInfo *c_proxyinfo

         self.__account = account.c_purple_account_new(username, protocol_id)
         self.__account = account.c_purple_account_new(username, protocol_id)

+        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)
+
+        c_proxyinfo = account.c_purple_account_get_proxy_info(self.__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.__account, c_proxyinfo)
+        self.__proxy = ProxyInfo()
+        self.__proxy.c_proxyinfo = c_proxyinfo
+

 
     def set_password(self, password):
         account.c_purple_account_set_password(self.__account, password)
 
     def set_password(self, password):
         account.c_purple_account_set_password(self.__account, password)

@@ -50,6 +64,11 @@ cdef class Account:
         self.__sstatus = savedstatuses.c_purple_savedstatus_new(NULL, status.PURPLE_STATUS_AVAILABLE)
         savedstatuses.c_purple_savedstatus_activate(self.__sstatus)
 
         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
     def get_buddies_online(self):
         cdef glib.GSList *iter
         cdef blist.PurpleBuddy *buddy

@@ -63,3 +82,52 @@ cdef class Account:
                 buddies += [buddy.name]
             iter = iter.next
         return buddies
                 buddies += [buddy.name]
             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 account.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 = <account.PurpleAccountOption *> iter.data
+            type = account.c_purple_account_option_get_type(option)
+            label_name = account.c_purple_account_option_get_text(option)
+            setting = account.c_purple_account_option_get_setting(option)
+            if type == prefs.PURPLE_PREF_STRING:
+                str_value = account.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.__account != NULL:
+                    str_value = account.c_purple_account_get_string(self.__account, setting, str_value)
+                    account.c_purple_account_set_string(self.__account, setting, str_value );
+
+            elif type == prefs.PURPLE_PREF_INT:
+                int_value = account.c_purple_account_option_get_default_int(option)
+                if self.__account != NULL:
+                   int_value = account.c_purple_account_get_int(self.__account, setting, int_value)
+                   if str(<char *> setting) == "port":
+                        account.c_purple_account_set_int(self.__account, setting, 443);
+
+            elif type == prefs.PURPLE_PREF_BOOLEAN:
+                bool_value = account.c_purple_account_option_get_default_bool(option)
+                if self.__account != NULL:
+                    bool_value = account.c_purple_account_get_bool(self.__account, setting, bool_value)
+                    if str(<char *> setting) == "old_ssl":
+                        account.c_purple_account_set_bool(self.__account, setting, True);
+
+            elif type == prefs.PURPLE_PREF_STRING_LIST:
+                str_value = account.c_purple_account_option_get_default_list_value(option)
+                if self.__account != NULL:
+                    str_value = account.c_purple_account_get_string(self.__account, setting, str_value)
+
+            iter = iter.next
+