X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=5e92065b35a90b00acea7f6354dffa1b3a630ede;hp=9c36757006dc9dd1c8dce53851bf66981766227f;hb=5fe506a5d23d5f7ba01599247a58bd03ca9eb7da;hpb=2491093a6b435f34eb5ba929ec404bf2aee87709

diff --git a/account.pyx b/account.pyx
index 9c36757..5e92065 100644
--- a/account.pyx
+++ b/account.pyx
@@ -29,8 +29,15 @@ cdef class Account:
     cdef prpl.PurplePluginProtocolInfo *c_prpl_info
     cdef plugin.PurplePluginInfo *c_plugin_info
     cdef savedstatuses.PurpleSavedStatus *__sstatus
-    cdef ProxyInfo __proxy
 
+    cdef object __proxy
+    cdef object __protocol
+
+    def __init__(self):
+        self.__proxy = purple.ProxyInfo()
+        self.__protocol = purple.Plugin()
+
+    '''
     def __init__(self, char *username, char *protocol_id):
         cdef proxy.PurpleProxyInfo *c_proxyinfo
         cdef account.PurpleAccount *acc = NULL
@@ -52,6 +59,7 @@ cdef class Account:
 
         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)
+    '''
 
     def __get_username(self):
         if self.c_account:
@@ -253,6 +261,14 @@ cdef class Account:
 
     protocol_labels = property(_get_protocol_labels)
 
+    def __get_proxy(self):
+        return self.__proxy
+    proxy = property(__get_proxy)
+
+    def __get_protocol(self):
+        return self.__protocol
+    protocol = property(__get_protocol)
+
     def get_protocol_name(self):
         if self.c_account:
             return account.c_purple_account_get_protocol_name(self.c_account)
@@ -263,17 +279,20 @@ cdef class Account:
         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):
+    def get_buddies_online(self, acc):
+        cdef account.PurpleAccount *c_account
         cdef glib.GSList *iter
         cdef blist.PurpleBuddy *buddy
         cdef char *c_name = NULL
         cdef char *c_alias = NULL
+
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            iter = blist.c_purple_find_buddies(c_account, NULL)
+        else:
+            return None
+
         buddies = []
-        iter = blist.c_purple_find_buddies(self.c_account, NULL)
         while iter:
             c_name = NULL
             c_alias = NULL
@@ -302,6 +321,8 @@ cdef class Account:
         if c_account == NULL:
             return None
 
+        account.c_purple_accounts_add(c_account) 
+
         return (username, protocol_id)
 
     def get_all(self):
@@ -325,18 +346,27 @@ cdef class Account:
     def get_password(self, acc):
         ''' @param acc Tuple (username, protocol id) '''
         cdef account.PurpleAccount *c_account
+        cdef char *value
+        value = NULL
 
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
-            return account.c_purple_account_get_password(c_account)
-        else:
+            value = <char *> account.c_purple_account_get_password(c_account)
+
+        if value == NULL:
             return None
+        else:
+            return value
+
 
     def set_password(self, acc, password):
         ''' @param acc Tuple (username, protocol id) '''
         ''' @param password The account's password '''
         cdef account.PurpleAccount *c_account
 
+        if not password:
+            return
+
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
             account.c_purple_account_set_password(c_account, password)
@@ -344,18 +374,26 @@ cdef class Account:
     def get_alias(self, acc):
         ''' @param acc Tuple (username, protocol id) '''
         cdef account.PurpleAccount *c_account
+        cdef char *value
+        value = NULL
 
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
-            return account.c_purple_account_get_alias(c_account)
-        else:
+            value = <char *> account.c_purple_account_get_alias(c_account)
+
+        if value == NULL:
             return None
+        else:
+            return value
 
     def set_alias(self, acc, alias):
         ''' @param acc Tuple (username, protocol id) '''
         ''' @param alias The account's alias '''
         cdef account.PurpleAccount *c_account
 
+        if not alias:
+            return
+
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
             account.c_purple_account_set_alias(c_account, alias)
@@ -365,6 +403,9 @@ cdef class Account:
         ''' @param protocol_id The new account's protocol id '''
         cdef account.PurpleAccount *c_account
 
+        if not protocol_id:
+            return
+
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
             account.c_purple_account_set_protocol_id(c_account, protocol_id)
@@ -373,12 +414,18 @@ cdef class Account:
         ''' @param acc Tuple (username, protocol id) '''
         ''' @return account's protocol id '''
         cdef account.PurpleAccount *c_account
+        cdef char *value
+        value = NULL
 
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
-            return account.c_purple_account_get_protocol_id(c_account)
-        else:
+            value = <char *> account.c_purple_account_get_protocol_id(c_account)
+
+        if value == NULL:
             return None
+        else:
+            return value
+
 
     def set_enabled(self, acc, ui, value):
         ''' @param acc Tuple (username, protocol id) '''
@@ -389,7 +436,7 @@ cdef class Account:
         c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account:
             account.c_purple_account_set_enabled(c_account, <char *> ui, bool(value))
- 
+
     def get_enabled(self, acc, ui):
         ''' @param acc Tuple (username, protocol id) '''
         ''' @param ui The UI '''
@@ -399,6 +446,54 @@ cdef class Account:
         if c_account:
             return account.c_purple_account_get_enabled(c_account, ui)
         else:
+            return False
+
+    def is_connected(self, acc):
+        ''' @param acc Tuple (username, protocol id) '''
+        ''' @param ui The UI '''
+        cdef account.PurpleAccount *c_account
+
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            return account.c_purple_account_is_connected(c_account)
+        else:
+            return False
+
+    def connect(self, acc):
+        ''' @param acc Tuple (username, protocol id) '''
+        ''' @param ui The UI '''
+        cdef account.PurpleAccount *c_account
+
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            account.c_purple_account_connect(c_account)
+
+    def disconnect(self, acc):
+        ''' @param acc Tuple (username, protocol id) '''
+        ''' @param ui The UI '''
+        cdef account.PurpleAccount *c_account
+
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            account.c_purple_account_disconnect(c_account)
+
+    def set_remember_password(self, acc, value):
+        cdef account.PurpleAccount *c_account
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            account.c_purple_account_set_remember_password(c_account, value)
+
+    def get_remember_password(self, acc):
+        cdef account.PurpleAccount *c_account
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            return account.c_purple_account_get_remember_password(c_account)
+        else:
             return None
 
+    def remove(self, acc):
+        cdef account.PurpleAccount *c_account
 
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
+        if c_account:
+            account.c_purple_accounts_delete(c_account)