X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=69872cb7414f0d6577104857278ad53e5a7339c4;hp=e569c520ac93f345716695d8662031ec94e22b3a;hb=0f988a54df0f8ddce03f4b587ed296f30edf2e9b;hpb=b18104778893417ea6ce29ceffe33adb526c86f6 diff --git a/account.pyx b/account.pyx index e569c52..69872cb 100644 --- a/account.pyx +++ b/account.pyx @@ -33,17 +33,25 @@ 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) + cdef account.PurpleAccount *acc = NULL - 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) + 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 + + 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: @@ -105,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 = 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( 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( 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( 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( 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 = iter.data + type = accountopt.c_purple_account_option_get_type(option) + setting = accountopt.c_purple_account_option_get_setting(option) + + sett = str( setting) + + if type == prefs.PURPLE_PREF_STRING: + + str_value = 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 = 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 = iter.data + label_name = accountopt.c_purple_account_option_get_text(option) + setting = accountopt.c_purple_account_option_get_setting(option) + + sett = str( setting) + label = str( 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) @@ -132,61 +280,93 @@ 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 = 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 - def get_protocol_options(self): - ''' FIXME: It is just a hack, to set the XMPP's options. ''' + def new(self, username, protocol_id): + cdef account.PurpleAccount *c_account + c_account = account.c_purple_account_new(username, protocol_id) + + if c_account == NULL: + return None + + return (username, protocol_id) + + def get_all(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 - iter = self.c_prpl_info.protocol_options + cdef account.PurpleAccount *acc + + accounts = [] + + iter = account.c_purple_accounts_get_all() while iter: - option = 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) + acc = iter.data + if acc: + username = account.c_purple_account_get_username(acc) + protocol_id = account.c_purple_account_get_protocol_id(acc) - # Google Talk default domain hackery! - if str_value == NULL and str( label_name) == "Connect server": - str_value = "talk.google.com" + accounts.append((username, protocol_id)) + iter = iter.next - 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 accounts - 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( setting) == "port": - account.c_purple_account_set_int(self.c_account, setting, 443) + def get_password(self, acc): + ''' @param acc Tuple (username, protocol id) ''' + cdef account.PurpleAccount *c_account - 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( setting) == "old_ssl": - account.c_purple_account_set_bool(self.c_account, setting, True) + c_account = account.c_purple_accounts_find(acc[0], acc[1]) + if c_account: + return account.c_purple_account_get_password(c_account) + else: + return None - 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) + def set_password(self, acc, password): + ''' @param acc Tuple (username, protocol id) ''' + ''' @param password The account's password ''' + cdef account.PurpleAccount *c_account + + c_account = account.c_purple_accounts_find(acc[0], acc[1]) + if c_account: + account.c_purple_account_set_password(c_account, password) + + def get_alias(self, acc): + ''' @param acc Tuple (username, protocol id) ''' + 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_alias(c_account) + else: + return None + + def set_alias(self, acc, alias): + ''' @param acc Tuple (username, protocol id) ''' + ''' @param alias The account's alias ''' + cdef account.PurpleAccount *c_account + + c_account = account.c_purple_accounts_find(acc[0], acc[1]) + if c_account: + account.c_purple_account_set_alias(c_account, alias) - iter = iter.next