X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=7dd484fa158d210e953b97f83e57fff535e6875d;hp=5438d24046d404038db75fa949571b3ff11dc709;hb=b4e3af9714befc9e9a71b843916a3dd48ef2c238;hpb=5cf9ef61f1ac6ccb0b3eaea65988873baf0a483a diff --git a/account.pyx b/account.pyx index 5438d24..7dd484f 100644 --- a/account.pyx +++ b/account.pyx @@ -33,52 +33,135 @@ cdef class Account: def __init__(self, char *username, char *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) + cdef account.PurpleAccount *acc = NULL + + acc = account.c_purple_accounts_find(username, protocol_id) + if acc: + self.c_account = acc + c_proxyinfo = account.c_purple_account_get_proxy_info(self.c_account) + else: + self.c_account = account.c_purple_account_new(username, protocol_id) + 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 + acc = NULL - def set_password(self, password): - account.c_purple_account_set_password(self.c_account, password) - - def set_enabled(self, ui, value): - account.c_purple_account_set_enabled(self.c_account, ui, value) + 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_acc_username(self): + def __get_username(self): if self.c_account: return account.c_purple_account_get_username(self.c_account) + else: + return None + def __set_username(self, username): + if self.c_account: + account.c_purple_account_set_username(self.c_account, username) + username = property(__get_password, __set_username) - def get_password(self): + def __get_password(self): if self.c_account: return account.c_purple_account_get_password(self.c_account) + else: + return None + def __set_password(self, password): + if self.c_account: + account.c_purple_account_set_password(self.c_account, password) + password = property(__get_password, __set_password) + + def __get_alias(self): + if self.c_account: + return account.c_purple_account_get_alias(self.c_account) + else: + return None + def __set_alias(self, alias): + if self.c_account: + account.c_purple_account_set_alias(self.c_account, alias) + alias = property(__get_alias, __set_alias) + + def __get_user_info(self): + if self.c_account: + return account.c_purple_account_get_user_info(self.c_account) + else: + return None + def __set_user_info(self, user_info): + if self.c_account: + account.c_purple_account_set_user_info(self.c_account, user_info) + user_info = property(__get_user_info, __set_user_info) + + def __get_protocol_id(self): + if self.c_account: + return account.c_purple_account_get_protocol_id(self.c_account) + else: + return None + def __set_protocol_id(self, protocol_id): + if self.c_account: + account.c_purple_account_set_protocol_id(self.c_account, protocol_id) + protocol_id = property(__get_protocol_id, __set_protocol_id) + + def __get_remember_password(self): + if self.c_account: + return account.c_purple_account_get_remember_password(self.c_account) + else: + return None + def __set_remember_password(self, value): + if self.c_account: + account.c_purple_account_set_remember_password(self.c_account, value) + remember_password = property(__get_remember_password, __set_remember_password) + + def get_protocol_name(self): + if self.c_account: + return account.c_purple_account_get_protocol_name(self.c_account) + else: + return None + + def get_enabled(self, ui): + if self.c_account: + return account.c_purple_account_get_enabled(self.c_account, ui) + else: + return None + + def set_enabled(self, ui, value): + if self.c_account: + account.c_purple_account_set_enabled(self.c_account, ui, value) 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): + def __get_proxy(self): return self.__proxy - - proxy = property(get_proxy) + proxy = property(__get_proxy) 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 = iter.data if 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 = blist.c_purple_buddy_get_name(buddy) + if c_name == NULL: + name = None + else: + name = c_name + c_alias = 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 @@ -129,3 +212,6 @@ cdef class Account: str_value = account.c_purple_account_get_string(self.c_account, setting, str_value) iter = iter.next + + def save_into_xml(self): + account.c_purple_accounts_add(self.c_account)