X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=6de9af84be96fed45fb305ccfd90d831de3940c5;hp=257c42555271617e290a877b0b68d320690e8562;hb=00e5b39ceb6340ed7731d21f676c7018fbd16841;hpb=646d7c8d83ca23e69c6ccc67000e33a331418413

diff --git a/account.pyx b/account.pyx
index 257c425..6de9af8 100644
--- a/account.pyx
+++ b/account.pyx
@@ -24,42 +24,56 @@ cdef extern from *:
 
 cdef class Account:
     """ Account class """
-    cdef account.PurpleAccount *__account
+    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):
-        self.__account = account.c_purple_account_new(username, protocol_id)
+        cdef proxy.PurpleProxyInfo *c_proxyinfo
+        self.c_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.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
+
 
     def set_password(self, password):
-        account.c_purple_account_set_password(self.__account, password)
+        account.c_purple_account_set_password(self.c_account, password)
 
     def set_enabled(self, ui, value):
-        account.c_purple_account_set_enabled(self.__account, ui, value)
+        account.c_purple_account_set_enabled(self.c_account, ui, value)
 
     def get_acc_username(self):
-        if self.__account:
-            return account.c_purple_account_get_username(self.__account)
+        if self.c_account:
+            return account.c_purple_account_get_username(self.c_account)
 
     def get_password(self):
-        if self.__account:
-            return account.c_purple_account_get_password(self.__account)
+        if self.c_account:
+            return account.c_purple_account_get_password(self.c_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_proxy(self):
+        return self.__proxy
+
+    proxy = property(get_proxy)
+
     def get_buddies_online(self):
         cdef glib.GSList *iter
         cdef blist.PurpleBuddy *buddy
         buddies = []
-        iter = blist.c_purple_find_buddies(self.__account, NULL)
+        iter = blist.c_purple_find_buddies(self.c_account, NULL)
         while iter:
             buddy = <blist.PurpleBuddy *> iter.data
             if <blist.PurpleBuddy *>buddy and \
@@ -69,23 +83,10 @@ cdef class Account:
             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:
-            return None
-        cdef ProxyInfo proxyinfo
-        proxyinfo = proxy.ProxyInfo()
-        proxyinfo.c_proxyinfo = c_proxyinfo
-        return proxyinfo
-
-    def set_proxyinfo(self, ProxyInfo proxyinf):
-        account.c_purple_account_set_proxy_info(self.__account, proxyinf.c_proxyinfo)
-
     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 accountopt.PurpleAccountOption *option
         cdef prefs.PurplePrefType type
         cdef const_char *label_name
         cdef const_char *str_value
@@ -94,39 +95,39 @@ cdef class Account:
         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)
+            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 = account.c_purple_account_option_get_default_string(option)
+                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.__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 );
+                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 = 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)
+                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.__account, setting, 443);
+                        account.c_purple_account_set_int(self.c_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)
+                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.__account, setting, True);
+                        account.c_purple_account_set_bool(self.c_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)
+                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