Mercurial > pidgin.yaz
diff libpurple/account.c @ 15823:32c366eeeb99
sed -ie 's/gaim/purple/g'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 07:01:17 +0000 |
| parents | f485c87e6546 |
| children | ac1a32ebd62c |
line wrap: on
line diff
--- a/libpurple/account.c Mon Mar 19 06:11:46 2007 +0000 +++ b/libpurple/account.c Mon Mar 19 07:01:17 2007 +0000 @@ -2,9 +2,9 @@ * @file account.c Account API * @ingroup core * - * gaim + * purple * - * Gaim is the legal property of its developers, whose names are too numerous + * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * @@ -40,10 +40,10 @@ #include "util.h" #include "xmlnode.h" -/* TODO: Should use GaimValue instead of this? What about "ui"? */ +/* TODO: Should use PurpleValue instead of this? What about "ui"? */ typedef struct { - GaimPrefType type; + PurplePrefType type; char *ui; @@ -55,17 +55,17 @@ } value; -} GaimAccountSetting; +} PurpleAccountSetting; typedef struct { - GaimAccountRequestType type; - GaimAccount *account; + PurpleAccountRequestType type; + PurpleAccount *account; void *ui_handle; -} GaimAccountRequestInfo; - -static GaimAccountUiOps *account_ui_ops = NULL; +} PurpleAccountRequestInfo; + +static PurpleAccountUiOps *account_ui_ops = NULL; static GList *accounts = NULL; static guint save_timer = 0; @@ -81,27 +81,27 @@ setting_to_xmlnode(gpointer key, gpointer value, gpointer user_data) { const char *name; - GaimAccountSetting *setting; + PurpleAccountSetting *setting; xmlnode *node, *child; char buf[20]; name = (const char *)key; - setting = (GaimAccountSetting *)value; + setting = (PurpleAccountSetting *)value; node = (xmlnode *)user_data; child = xmlnode_new_child(node, "setting"); xmlnode_set_attrib(child, "name", name); - if (setting->type == GAIM_PREF_INT) { + if (setting->type == PURPLE_PREF_INT) { xmlnode_set_attrib(child, "type", "int"); snprintf(buf, sizeof(buf), "%d", setting->value.integer); xmlnode_insert_data(child, buf, -1); } - else if (setting->type == GAIM_PREF_STRING && setting->value.string != NULL) { + else if (setting->type == PURPLE_PREF_STRING && setting->value.string != NULL) { xmlnode_set_attrib(child, "type", "string"); xmlnode_insert_data(child, setting->value.string, -1); } - else if (setting->type == GAIM_PREF_BOOLEAN) { + else if (setting->type == PURPLE_PREF_BOOLEAN) { xmlnode_set_attrib(child, "type", "bool"); snprintf(buf, sizeof(buf), "%d", setting->value.bool); xmlnode_insert_data(child, buf, -1); @@ -128,57 +128,57 @@ } static xmlnode * -status_attr_to_xmlnode(const GaimStatus *status, const GaimStatusType *type, const GaimStatusAttr *attr) +status_attr_to_xmlnode(const PurpleStatus *status, const PurpleStatusType *type, const PurpleStatusAttr *attr) { xmlnode *node; const char *id; char *value = NULL; - GaimStatusAttr *default_attr; - GaimValue *default_value; - GaimType attr_type; - GaimValue *attr_value; - - id = gaim_status_attr_get_id(attr); + PurpleStatusAttr *default_attr; + PurpleValue *default_value; + PurpleType attr_type; + PurpleValue *attr_value; + + id = purple_status_attr_get_id(attr); g_return_val_if_fail(id, NULL); - attr_value = gaim_status_get_attr_value(status, id); + attr_value = purple_status_get_attr_value(status, id); g_return_val_if_fail(attr_value, NULL); - attr_type = gaim_value_get_type(attr_value); + attr_type = purple_value_get_type(attr_value); /* * If attr_value is a different type than it should be * then don't write it to the file. */ - default_attr = gaim_status_type_get_attr(type, id); - default_value = gaim_status_attr_get_value(default_attr); - if (attr_type != gaim_value_get_type(default_value)) + default_attr = purple_status_type_get_attr(type, id); + default_value = purple_status_attr_get_value(default_attr); + if (attr_type != purple_value_get_type(default_value)) return NULL; /* * If attr_value is the same as the default for this status * then there is no need to write it to the file. */ - if (attr_type == GAIM_TYPE_STRING) + if (attr_type == PURPLE_TYPE_STRING) { - const char *string_value = gaim_value_get_string(attr_value); - const char *default_string_value = gaim_value_get_string(default_value); + const char *string_value = purple_value_get_string(attr_value); + const char *default_string_value = purple_value_get_string(default_value); if (((string_value == NULL) && (default_string_value == NULL)) || ((string_value != NULL) && (default_string_value != NULL) && !strcmp(string_value, default_string_value))) return NULL; - value = g_strdup(gaim_value_get_string(attr_value)); + value = g_strdup(purple_value_get_string(attr_value)); } - else if (attr_type == GAIM_TYPE_INT) + else if (attr_type == PURPLE_TYPE_INT) { - int int_value = gaim_value_get_int(attr_value); - if (int_value == gaim_value_get_int(default_value)) + int int_value = purple_value_get_int(attr_value); + if (int_value == purple_value_get_int(default_value)) return NULL; value = g_strdup_printf("%d", int_value); } - else if (attr_type == GAIM_TYPE_BOOLEAN) + else if (attr_type == PURPLE_TYPE_BOOLEAN) { - gboolean boolean_value = gaim_value_get_boolean(attr_value); - if (boolean_value == gaim_value_get_boolean(default_value)) + gboolean boolean_value = purple_value_get_boolean(attr_value); + if (boolean_value == purple_value_get_boolean(default_value)) return NULL; value = g_strdup(boolean_value ? "true" : "false"); @@ -201,18 +201,18 @@ } static xmlnode * -status_attrs_to_xmlnode(const GaimStatus *status) +status_attrs_to_xmlnode(const PurpleStatus *status) { - GaimStatusType *type = gaim_status_get_type(status); + PurpleStatusType *type = purple_status_get_type(status); xmlnode *node, *child; const GList *attrs, *attr; node = xmlnode_new("attributes"); - attrs = gaim_status_type_get_attrs(type); + attrs = purple_status_type_get_attrs(type); for (attr = attrs; attr != NULL; attr = attr->next) { - child = status_attr_to_xmlnode(status, type, (const GaimStatusAttr *)attr->data); + child = status_attr_to_xmlnode(status, type, (const PurpleStatusAttr *)attr->data); if (child) xmlnode_insert_child(node, child); } @@ -221,15 +221,15 @@ } static xmlnode * -status_to_xmlnode(const GaimStatus *status) +status_to_xmlnode(const PurpleStatus *status) { xmlnode *node, *child; node = xmlnode_new("status"); - xmlnode_set_attrib(node, "type", gaim_status_get_id(status)); - if (gaim_status_get_name(status) != NULL) - xmlnode_set_attrib(node, "name", gaim_status_get_name(status)); - xmlnode_set_attrib(node, "active", gaim_status_is_active(status) ? "true" : "false"); + xmlnode_set_attrib(node, "type", purple_status_get_id(status)); + if (purple_status_get_name(status) != NULL) + xmlnode_set_attrib(node, "name", purple_status_get_name(status)); + xmlnode_set_attrib(node, "active", purple_status_is_active(status) ? "true" : "false"); child = status_attrs_to_xmlnode(status); xmlnode_insert_child(node, child); @@ -238,17 +238,17 @@ } static xmlnode * -statuses_to_xmlnode(const GaimPresence *presence) +statuses_to_xmlnode(const PurplePresence *presence) { xmlnode *node, *child; const GList *statuses, *status; node = xmlnode_new("statuses"); - statuses = gaim_presence_get_statuses(presence); + statuses = purple_presence_get_statuses(presence); for (status = statuses; status != NULL; status = status->next) { - child = status_to_xmlnode((GaimStatus *)status->data); + child = status_to_xmlnode((PurpleStatus *)status->data); xmlnode_insert_child(node, child); } @@ -256,47 +256,47 @@ } static xmlnode * -proxy_settings_to_xmlnode(GaimProxyInfo *proxy_info) +proxy_settings_to_xmlnode(PurpleProxyInfo *proxy_info) { xmlnode *node, *child; - GaimProxyType proxy_type; + PurpleProxyType proxy_type; const char *value; int int_value; char buf[20]; - proxy_type = gaim_proxy_info_get_type(proxy_info); + proxy_type = purple_proxy_info_get_type(proxy_info); node = xmlnode_new("proxy"); child = xmlnode_new_child(node, "type"); xmlnode_insert_data(child, - (proxy_type == GAIM_PROXY_USE_GLOBAL ? "global" : - proxy_type == GAIM_PROXY_NONE ? "none" : - proxy_type == GAIM_PROXY_HTTP ? "http" : - proxy_type == GAIM_PROXY_SOCKS4 ? "socks4" : - proxy_type == GAIM_PROXY_SOCKS5 ? "socks5" : - proxy_type == GAIM_PROXY_USE_ENVVAR ? "envvar" : "unknown"), -1); - - if ((value = gaim_proxy_info_get_host(proxy_info)) != NULL) + (proxy_type == PURPLE_PROXY_USE_GLOBAL ? "global" : + proxy_type == PURPLE_PROXY_NONE ? "none" : + proxy_type == PURPLE_PROXY_HTTP ? "http" : + proxy_type == PURPLE_PROXY_SOCKS4 ? "socks4" : + proxy_type == PURPLE_PROXY_SOCKS5 ? "socks5" : + proxy_type == PURPLE_PROXY_USE_ENVVAR ? "envvar" : "unknown"), -1); + + if ((value = purple_proxy_info_get_host(proxy_info)) != NULL) { child = xmlnode_new_child(node, "host"); xmlnode_insert_data(child, value, -1); } - if ((int_value = gaim_proxy_info_get_port(proxy_info)) != 0) + if ((int_value = purple_proxy_info_get_port(proxy_info)) != 0) { snprintf(buf, sizeof(buf), "%d", int_value); child = xmlnode_new_child(node, "port"); xmlnode_insert_data(child, buf, -1); } - if ((value = gaim_proxy_info_get_username(proxy_info)) != NULL) + if ((value = purple_proxy_info_get_username(proxy_info)) != NULL) { child = xmlnode_new_child(node, "username"); xmlnode_insert_data(child, value, -1); } - if ((value = gaim_proxy_info_get_password(proxy_info)) != NULL) + if ((value = purple_proxy_info_get_password(proxy_info)) != NULL) { child = xmlnode_new_child(node, "password"); xmlnode_insert_data(child, value, -1); @@ -306,48 +306,48 @@ } static xmlnode * -account_to_xmlnode(GaimAccount *account) +account_to_xmlnode(PurpleAccount *account) { xmlnode *node, *child; const char *tmp; - GaimPresence *presence; - GaimProxyInfo *proxy_info; + PurplePresence *presence; + PurpleProxyInfo *proxy_info; node = xmlnode_new("account"); child = xmlnode_new_child(node, "protocol"); - xmlnode_insert_data(child, gaim_account_get_protocol_id(account), -1); + xmlnode_insert_data(child, purple_account_get_protocol_id(account), -1); child = xmlnode_new_child(node, "name"); - xmlnode_insert_data(child, gaim_account_get_username(account), -1); - - if (gaim_account_get_remember_password(account) && - ((tmp = gaim_account_get_password(account)) != NULL)) + xmlnode_insert_data(child, purple_account_get_username(account), -1); + + if (purple_account_get_remember_password(account) && + ((tmp = purple_account_get_password(account)) != NULL)) { child = xmlnode_new_child(node, "password"); xmlnode_insert_data(child, tmp, -1); } - if ((tmp = gaim_account_get_alias(account)) != NULL) + if ((tmp = purple_account_get_alias(account)) != NULL) { child = xmlnode_new_child(node, "alias"); xmlnode_insert_data(child, tmp, -1); } - if ((presence = gaim_account_get_presence(account)) != NULL) + if ((presence = purple_account_get_presence(account)) != NULL) { child = statuses_to_xmlnode(presence); xmlnode_insert_child(node, child); } - if ((tmp = gaim_account_get_user_info(account)) != NULL) + if ((tmp = purple_account_get_user_info(account)) != NULL) { - /* TODO: Do we need to call gaim_str_strip_char(tmp, '\r') here? */ + /* TODO: Do we need to call purple_str_strip_char(tmp, '\r') here? */ child = xmlnode_new_child(node, "userinfo"); xmlnode_insert_data(child, tmp, -1); } - if ((tmp = gaim_account_get_buddy_icon(account)) != NULL) + if ((tmp = purple_account_get_buddy_icon(account)) != NULL) { child = xmlnode_new_child(node, "buddyicon"); xmlnode_insert_data(child, tmp, -1); @@ -364,7 +364,7 @@ g_hash_table_foreach(account->ui_settings, ui_setting_to_xmlnode, node); } - if ((proxy_info = gaim_account_get_proxy_info(account)) != NULL) + if ((proxy_info = purple_account_get_proxy_info(account)) != NULL) { child = proxy_settings_to_xmlnode(proxy_info); xmlnode_insert_child(node, child); @@ -382,7 +382,7 @@ node = xmlnode_new("account"); xmlnode_set_attrib(node, "version", "1.0"); - for (cur = gaim_accounts_get_all(); cur != NULL; cur = cur->next) + for (cur = purple_accounts_get_all(); cur != NULL; cur = cur->next) { child = account_to_xmlnode(cur->data); xmlnode_insert_child(node, child); @@ -399,14 +399,14 @@ if (!accounts_loaded) { - gaim_debug_error("account", "Attempted to save accounts before " + purple_debug_error("account", "Attempted to save accounts before " "they were read!\n"); return; } node = accounts_to_xmlnode(); data = xmlnode_to_formatted_str(node, NULL); - gaim_util_write_data_to_file("accounts.xml", data, -1); + purple_util_write_data_to_file("accounts.xml", data, -1); g_free(data); xmlnode_free(node); } @@ -423,7 +423,7 @@ schedule_accounts_save() { if (save_timer == 0) - save_timer = gaim_timeout_add(5000, save_cb, NULL); + save_timer = purple_timeout_add(5000, save_cb, NULL); } @@ -432,7 +432,7 @@ *********************************************************************/ static void -parse_settings(xmlnode *node, GaimAccount *account) +parse_settings(xmlnode *node, PurpleAccount *account) { const char *ui; xmlnode *child; @@ -445,7 +445,7 @@ child = xmlnode_get_next_twin(child)) { const char *name, *str_type; - GaimPrefType type; + PurplePrefType type; char *data; name = xmlnode_get_attrib(child, "name"); @@ -459,11 +459,11 @@ continue; if (!strcmp(str_type, "string")) - type = GAIM_PREF_STRING; + type = PURPLE_PREF_STRING; else if (!strcmp(str_type, "int")) - type = GAIM_PREF_INT; + type = PURPLE_PREF_INT; else if (!strcmp(str_type, "bool")) - type = GAIM_PREF_BOOLEAN; + type = PURPLE_PREF_BOOLEAN; else /* Ignore this setting */ continue; @@ -475,20 +475,20 @@ if (ui == NULL) { - if (type == GAIM_PREF_STRING) - gaim_account_set_string(account, name, data); - else if (type == GAIM_PREF_INT) - gaim_account_set_int(account, name, atoi(data)); - else if (type == GAIM_PREF_BOOLEAN) - gaim_account_set_bool(account, name, + if (type == PURPLE_PREF_STRING) + purple_account_set_string(account, name, data); + else if (type == PURPLE_PREF_INT) + purple_account_set_int(account, name, atoi(data)); + else if (type == PURPLE_PREF_BOOLEAN) + purple_account_set_bool(account, name, (*data == '0' ? FALSE : TRUE)); } else { - if (type == GAIM_PREF_STRING) - gaim_account_set_ui_string(account, ui, name, data); - else if (type == GAIM_PREF_INT) - gaim_account_set_ui_int(account, ui, name, atoi(data)); - else if (type == GAIM_PREF_BOOLEAN) - gaim_account_set_ui_bool(account, ui, name, + if (type == PURPLE_PREF_STRING) + purple_account_set_ui_string(account, ui, name, data); + else if (type == PURPLE_PREF_INT) + purple_account_set_ui_int(account, ui, name, atoi(data)); + else if (type == PURPLE_PREF_BOOLEAN) + purple_account_set_ui_bool(account, ui, name, (*data == '0' ? FALSE : TRUE)); } @@ -497,11 +497,11 @@ } static GList * -parse_status_attrs(xmlnode *node, GaimStatus *status) +parse_status_attrs(xmlnode *node, PurpleStatus *status) { GList *list = NULL; xmlnode *child; - GaimValue *attr_value; + PurpleValue *attr_value; for (child = xmlnode_get_child(node, "attribute"); child != NULL; child = xmlnode_get_next_twin(child)) @@ -512,19 +512,19 @@ if (!id || !*id || !value || !*value) continue; - attr_value = gaim_status_get_attr_value(status, id); + attr_value = purple_status_get_attr_value(status, id); if (!attr_value) continue; list = g_list_append(list, (char *)id); - switch (gaim_value_get_type(attr_value)) + switch (purple_value_get_type(attr_value)) { - case GAIM_TYPE_STRING: + case PURPLE_TYPE_STRING: list = g_list_append(list, (char *)value); break; - case GAIM_TYPE_INT: - case GAIM_TYPE_BOOLEAN: + case PURPLE_TYPE_INT: + case PURPLE_TYPE_BOOLEAN: { int v; if (sscanf(value, "%d", &v) == 1) @@ -542,7 +542,7 @@ } static void -parse_status(xmlnode *node, GaimAccount *account) +parse_status(xmlnode *node, PurpleAccount *account) { gboolean active = FALSE; const char *data; @@ -571,16 +571,16 @@ if (child != NULL) { attrs = parse_status_attrs(child, - gaim_account_get_status(account, type)); + purple_account_get_status(account, type)); } - gaim_account_set_status_list(account, type, active, attrs); + purple_account_set_status_list(account, type, active, attrs); g_list_free(attrs); } static void -parse_statuses(xmlnode *node, GaimAccount *account) +parse_statuses(xmlnode *node, PurpleAccount *account) { xmlnode *child; @@ -592,38 +592,38 @@ } static void -parse_proxy_info(xmlnode *node, GaimAccount *account) +parse_proxy_info(xmlnode *node, PurpleAccount *account) { - GaimProxyInfo *proxy_info; + PurpleProxyInfo *proxy_info; xmlnode *child; char *data; - proxy_info = gaim_proxy_info_new(); + proxy_info = purple_proxy_info_new(); /* Use the global proxy settings, by default */ - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_USE_GLOBAL); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_GLOBAL); /* Read proxy type */ child = xmlnode_get_child(node, "type"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { if (!strcmp(data, "global")) - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_USE_GLOBAL); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_GLOBAL); else if (!strcmp(data, "none")) - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_NONE); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); else if (!strcmp(data, "http")) - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_HTTP); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_HTTP); else if (!strcmp(data, "socks4")) - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_SOCKS4); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_SOCKS4); else if (!strcmp(data, "socks5")) - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_SOCKS5); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_SOCKS5); else if (!strcmp(data, "envvar")) - gaim_proxy_info_set_type(proxy_info, GAIM_PROXY_USE_ENVVAR); + purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_ENVVAR); else { - gaim_debug_error("account", "Invalid proxy type found when " + purple_debug_error("account", "Invalid proxy type found when " "loading account information for %s\n", - gaim_account_get_username(account)); + purple_account_get_username(account)); } g_free(data); } @@ -632,7 +632,7 @@ child = xmlnode_get_child(node, "host"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_proxy_info_set_host(proxy_info, data); + purple_proxy_info_set_host(proxy_info, data); g_free(data); } @@ -640,7 +640,7 @@ child = xmlnode_get_child(node, "port"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_proxy_info_set_port(proxy_info, atoi(data)); + purple_proxy_info_set_port(proxy_info, atoi(data)); g_free(data); } @@ -648,7 +648,7 @@ child = xmlnode_get_child(node, "username"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_proxy_info_set_username(proxy_info, data); + purple_proxy_info_set_username(proxy_info, data); g_free(data); } @@ -656,28 +656,28 @@ child = xmlnode_get_child(node, "password"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_proxy_info_set_password(proxy_info, data); + purple_proxy_info_set_password(proxy_info, data); g_free(data); } /* If there are no values set then proxy_info NULL */ - if ((gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_USE_GLOBAL) && - (gaim_proxy_info_get_host(proxy_info) == NULL) && - (gaim_proxy_info_get_port(proxy_info) == 0) && - (gaim_proxy_info_get_username(proxy_info) == NULL) && - (gaim_proxy_info_get_password(proxy_info) == NULL)) + if ((purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) && + (purple_proxy_info_get_host(proxy_info) == NULL) && + (purple_proxy_info_get_port(proxy_info) == 0) && + (purple_proxy_info_get_username(proxy_info) == NULL) && + (purple_proxy_info_get_password(proxy_info) == NULL)) { - gaim_proxy_info_destroy(proxy_info); + purple_proxy_info_destroy(proxy_info); return; } - gaim_account_set_proxy_info(account, proxy_info); + purple_account_set_proxy_info(account, proxy_info); } -static GaimAccount * +static PurpleAccount * parse_account(xmlnode *node) { - GaimAccount *ret; + PurpleAccount *ret; xmlnode *child; char *protocol_id = NULL; char *name = NULL; @@ -705,7 +705,7 @@ return NULL; } - ret = gaim_account_new(name, _gaim_oscar_convert(name, protocol_id)); /* XXX: */ + ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */ g_free(name); g_free(protocol_id); @@ -713,8 +713,8 @@ child = xmlnode_get_child(node, "password"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_account_set_remember_password(ret, TRUE); - gaim_account_set_password(ret, data); + purple_account_set_remember_password(ret, TRUE); + purple_account_set_password(ret, data); g_free(data); } @@ -723,7 +723,7 @@ if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { if (*data != '\0') - gaim_account_set_alias(ret, data); + purple_account_set_alias(ret, data); g_free(data); } @@ -738,7 +738,7 @@ child = xmlnode_get_child(node, "userinfo"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_account_set_user_info(ret, data); + purple_account_set_user_info(ret, data); g_free(data); } @@ -746,7 +746,7 @@ child = xmlnode_get_child(node, "buddyicon"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_account_set_buddy_icon(ret, data); + purple_account_set_buddy_icon(ret, data); g_free(data); } @@ -774,7 +774,7 @@ accounts_loaded = TRUE; - node = gaim_util_read_xml_from_file("accounts.xml", _("accounts")); + node = purple_util_read_xml_from_file("accounts.xml", _("accounts")); if (node == NULL) return; @@ -782,9 +782,9 @@ for (child = xmlnode_get_child(node, "account"); child != NULL; child = xmlnode_get_next_twin(child)) { - GaimAccount *new_acct; + PurpleAccount *new_acct; new_acct = parse_account(child); - gaim_accounts_add(new_acct); + purple_accounts_add(new_acct); } xmlnode_free(node); @@ -794,38 +794,38 @@ static void delete_setting(void *data) { - GaimAccountSetting *setting = (GaimAccountSetting *)data; + PurpleAccountSetting *setting = (PurpleAccountSetting *)data; g_free(setting->ui); - if (setting->type == GAIM_PREF_STRING) + if (setting->type == PURPLE_PREF_STRING) g_free(setting->value.string); g_free(setting); } -GaimAccount * -gaim_account_new(const char *username, const char *protocol_id) +PurpleAccount * +purple_account_new(const char *username, const char *protocol_id) { - GaimAccount *account = NULL; - GaimPlugin *prpl = NULL; - GaimPluginProtocolInfo *prpl_info = NULL; - GaimStatusType *status_type; + PurpleAccount *account = NULL; + PurplePlugin *prpl = NULL; + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleStatusType *status_type; g_return_val_if_fail(username != NULL, NULL); g_return_val_if_fail(protocol_id != NULL, NULL); - account = gaim_accounts_find(username, protocol_id); + account = purple_accounts_find(username, protocol_id); if (account != NULL) return account; - account = g_new0(GaimAccount, 1); - GAIM_DBUS_REGISTER_POINTER(account, GaimAccount); - - gaim_account_set_username(account, username); - - gaim_account_set_protocol_id(account, protocol_id); + account = g_new0(PurpleAccount, 1); + PURPLE_DBUS_REGISTER_POINTER(account, PurpleAccount); + + purple_account_set_username(account, username); + + purple_account_set_protocol_id(account, protocol_id); account->settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, delete_setting); @@ -833,26 +833,26 @@ g_free, (GDestroyNotify)g_hash_table_destroy); account->system_log = NULL; /* 0 is not a valid privacy setting */ - account->perm_deny = GAIM_PRIVACY_ALLOW_ALL; - - prpl = gaim_find_prpl(protocol_id); + account->perm_deny = PURPLE_PRIVACY_ALLOW_ALL; + + prpl = purple_find_prpl(protocol_id); if (prpl == NULL) return account; - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); if (prpl_info != NULL && prpl_info->status_types != NULL) - gaim_account_set_status_types(account, prpl_info->status_types(account)); - - account->presence = gaim_presence_new_for_account(account); - - status_type = gaim_account_get_status_type_with_primitive(account, GAIM_STATUS_AVAILABLE); + purple_account_set_status_types(account, prpl_info->status_types(account)); + + account->presence = purple_presence_new_for_account(account); + + status_type = purple_account_get_status_type_with_primitive(account, PURPLE_STATUS_AVAILABLE); if (status_type != NULL) - gaim_presence_set_status_active(account->presence, - gaim_status_type_get_id(status_type), + purple_presence_set_status_active(account->presence, + purple_status_type_get_id(status_type), TRUE); else - gaim_presence_set_status_active(account->presence, + purple_presence_set_status_active(account->presence, "offline", TRUE); @@ -860,20 +860,20 @@ } void -gaim_account_destroy(GaimAccount *account) +purple_account_destroy(PurpleAccount *account) { GList *l; g_return_if_fail(account != NULL); - gaim_debug_info("account", "Destroying account %p\n", account); - - for (l = gaim_get_conversations(); l != NULL; l = l->next) + purple_debug_info("account", "Destroying account %p\n", account); + + for (l = purple_get_conversations(); l != NULL; l = l->next) { - GaimConversation *conv = (GaimConversation *)l->data; - - if (gaim_conversation_get_account(conv) == account) - gaim_conversation_set_account(conv, NULL); + PurpleConversation *conv = (PurpleConversation *)l->data; + + if (purple_conversation_get_account(conv) == account) + purple_conversation_set_account(conv, NULL); } g_free(account->username); @@ -887,80 +887,80 @@ g_hash_table_destroy(account->settings); g_hash_table_destroy(account->ui_settings); - gaim_account_set_status_types(account, NULL); - - gaim_presence_destroy(account->presence); + purple_account_set_status_types(account, NULL); + + purple_presence_destroy(account->presence); if(account->system_log) - gaim_log_free(account->system_log); - - GAIM_DBUS_UNREGISTER_POINTER(account); + purple_log_free(account->system_log); + + PURPLE_DBUS_UNREGISTER_POINTER(account); g_free(account); } void -gaim_account_register(GaimAccount *account) +purple_account_register(PurpleAccount *account) { g_return_if_fail(account != NULL); - gaim_debug_info("account", "Registering account %s\n", - gaim_account_get_username(account)); - - gaim_connection_new(account, TRUE, gaim_account_get_password(account)); + purple_debug_info("account", "Registering account %s\n", + purple_account_get_username(account)); + + purple_connection_new(account, TRUE, purple_account_get_password(account)); } static void -request_password_ok_cb(GaimAccount *account, GaimRequestFields *fields) +request_password_ok_cb(PurpleAccount *account, PurpleRequestFields *fields) { const char *entry; gboolean remember; - entry = gaim_request_fields_get_string(fields, "password"); - remember = gaim_request_fields_get_bool(fields, "remember"); + entry = purple_request_fields_get_string(fields, "password"); + remember = purple_request_fields_get_bool(fields, "remember"); if (!entry || !*entry) { - gaim_notify_error(account, NULL, _("Password is required to sign on."), NULL); + purple_notify_error(account, NULL, _("Password is required to sign on."), NULL); return; } if(remember) - gaim_account_set_remember_password(account, TRUE); - - gaim_account_set_password(account, entry); - - gaim_connection_new(account, FALSE, entry); + purple_account_set_remember_password(account, TRUE); + + purple_account_set_password(account, entry); + + purple_connection_new(account, FALSE, entry); } static void -request_password(GaimAccount *account) +request_password(PurpleAccount *account) { gchar *primary; const gchar *username; - GaimRequestFieldGroup *group; - GaimRequestField *field; - GaimRequestFields *fields; + PurpleRequestFieldGroup *group; + PurpleRequestField *field; + PurpleRequestFields *fields; /* Close any previous password request windows */ - gaim_request_close_with_handle(account); - - username = gaim_account_get_username(account); + purple_request_close_with_handle(account); + + username = purple_account_get_username(account); primary = g_strdup_printf(_("Enter password for %s (%s)"), username, - gaim_account_get_protocol_name(account)); - - fields = gaim_request_fields_new(); - group = gaim_request_field_group_new(NULL); - gaim_request_fields_add_group(fields, group); - - field = gaim_request_field_string_new("password", _("Enter Password"), NULL, FALSE); - gaim_request_field_string_set_masked(field, TRUE); - gaim_request_field_set_required(field, TRUE); - gaim_request_field_group_add_field(group, field); - - field = gaim_request_field_bool_new("remember", _("Save password"), FALSE); - gaim_request_field_group_add_field(group, field); - - gaim_request_fields(account, + purple_account_get_protocol_name(account)); + + fields = purple_request_fields_new(); + group = purple_request_field_group_new(NULL); + purple_request_fields_add_group(fields, group); + + field = purple_request_field_string_new("password", _("Enter Password"), NULL, FALSE); + purple_request_field_string_set_masked(field, TRUE); + purple_request_field_set_required(field, TRUE); + purple_request_field_group_add_field(group, field); + + field = purple_request_field_bool_new("remember", _("Save password"), FALSE); + purple_request_field_group_add_field(group, field); + + purple_request_fields(account, NULL, primary, NULL, @@ -972,101 +972,101 @@ } void -gaim_account_connect(GaimAccount *account) +purple_account_connect(PurpleAccount *account) { - GaimPlugin *prpl; - GaimPluginProtocolInfo *prpl_info; + PurplePlugin *prpl; + PurplePluginProtocolInfo *prpl_info; const char *password; g_return_if_fail(account != NULL); - gaim_debug_info("account", "Connecting to account %s\n", - gaim_account_get_username(account)); - - if (!gaim_account_get_enabled(account, gaim_core_get_ui())) + purple_debug_info("account", "Connecting to account %s\n", + purple_account_get_username(account)); + + if (!purple_account_get_enabled(account, purple_core_get_ui())) return; - prpl = gaim_find_prpl(gaim_account_get_protocol_id(account)); + prpl = purple_find_prpl(purple_account_get_protocol_id(account)); if (prpl == NULL) { gchar *message; message = g_strdup_printf(_("Missing protocol plugin for %s"), - gaim_account_get_username(account)); - gaim_notify_error(account, _("Connection Error"), message, NULL); + purple_account_get_username(account)); + purple_notify_error(account, _("Connection Error"), message, NULL); g_free(message); return; } - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl); - password = gaim_account_get_password(account); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); + password = purple_account_get_password(account); if ((password == NULL) && !(prpl_info->options & OPT_PROTO_NO_PASSWORD) && !(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL)) request_password(account); else - gaim_connection_new(account, FALSE, password); + purple_connection_new(account, FALSE, password); } void -gaim_account_disconnect(GaimAccount *account) +purple_account_disconnect(PurpleAccount *account) { - GaimConnection *gc; + PurpleConnection *gc; g_return_if_fail(account != NULL); - g_return_if_fail(!gaim_account_is_disconnected(account)); - - gaim_debug_info("account", "Disconnecting account %p\n", account); + g_return_if_fail(!purple_account_is_disconnected(account)); + + purple_debug_info("account", "Disconnecting account %p\n", account); account->disconnecting = TRUE; - gc = gaim_account_get_connection(account); - gaim_connection_destroy(gc); - if (!gaim_account_get_remember_password(account)) - gaim_account_set_password(account, NULL); - gaim_account_set_connection(account, NULL); + gc = purple_account_get_connection(account); + purple_connection_destroy(gc); + if (!purple_account_get_remember_password(account)) + purple_account_set_password(account, NULL); + purple_account_set_connection(account, NULL); account->disconnecting = FALSE; } void -gaim_account_notify_added(GaimAccount *account, const char *remote_user, +purple_account_notify_added(PurpleAccount *account, const char *remote_user, const char *id, const char *alias, const char *message) { - GaimAccountUiOps *ui_ops; + PurpleAccountUiOps *ui_ops; g_return_if_fail(account != NULL); g_return_if_fail(remote_user != NULL); - ui_ops = gaim_accounts_get_ui_ops(); + ui_ops = purple_accounts_get_ui_ops(); if (ui_ops != NULL && ui_ops->notify_added != NULL) ui_ops->notify_added(account, remote_user, id, alias, message); } void -gaim_account_request_add(GaimAccount *account, const char *remote_user, +purple_account_request_add(PurpleAccount *account, const char *remote_user, const char *id, const char *alias, const char *message) { - GaimAccountUiOps *ui_ops; + PurpleAccountUiOps *ui_ops; g_return_if_fail(account != NULL); g_return_if_fail(remote_user != NULL); - ui_ops = gaim_accounts_get_ui_ops(); + ui_ops = purple_accounts_get_ui_ops(); if (ui_ops != NULL && ui_ops->request_add != NULL) ui_ops->request_add(account, remote_user, id, alias, message); } static void -gaim_account_request_close_info(GaimAccountRequestInfo *info) +purple_account_request_close_info(PurpleAccountRequestInfo *info) { - GaimAccountUiOps *ops; - - ops = gaim_accounts_get_ui_ops(); + PurpleAccountUiOps *ops; + + ops = purple_accounts_get_ui_ops(); if (ops != NULL && ops->close_account_request != NULL) ops->close_account_request(info->ui_handle); @@ -1075,59 +1075,59 @@ } void -gaim_account_request_close_with_account(GaimAccount *account) +purple_account_request_close_with_account(PurpleAccount *account) { GList *l, *l_next; g_return_if_fail(account != NULL); for (l = handles; l != NULL; l = l_next) { - GaimAccountRequestInfo *info = l->data; + PurpleAccountRequestInfo *info = l->data; l_next = l->next; if (info->account == account) { handles = g_list_remove(handles, info); - gaim_account_request_close_info(info); + purple_account_request_close_info(info); } } } void -gaim_account_request_close(void *ui_handle) +purple_account_request_close(void *ui_handle) { GList *l, *l_next; g_return_if_fail(ui_handle != NULL); for (l = handles; l != NULL; l = l_next) { - GaimAccountRequestInfo *info = l->data; + PurpleAccountRequestInfo *info = l->data; l_next = l->next; if (info->ui_handle == ui_handle) { handles = g_list_remove(handles, info); - gaim_account_request_close_info(info); + purple_account_request_close_info(info); } } } void * -gaim_account_request_authorization(GaimAccount *account, const char *remote_user, +purple_account_request_authorization(PurpleAccount *account, const char *remote_user, const char *id, const char *alias, const char *message, gboolean on_list, GCallback auth_cb, GCallback deny_cb, void *user_data) { - GaimAccountUiOps *ui_ops; - GaimAccountRequestInfo *info; + PurpleAccountUiOps *ui_ops; + PurpleAccountRequestInfo *info; g_return_val_if_fail(account != NULL, NULL); g_return_val_if_fail(remote_user != NULL, NULL); - ui_ops = gaim_accounts_get_ui_ops(); + ui_ops = purple_accounts_get_ui_ops(); if (ui_ops != NULL && ui_ops->request_authorize != NULL) { - info = g_new0(GaimAccountRequestInfo, 1); - info->type = GAIM_ACCOUNT_REQUEST_AUTHORIZATION; + info = g_new0(PurpleAccountRequestInfo, 1); + info->type = PURPLE_ACCOUNT_REQUEST_AUTHORIZATION; info->account = account; info->ui_handle = ui_ops->request_authorize(account, remote_user, id, alias, message, on_list, auth_cb, deny_cb, user_data); @@ -1140,17 +1140,17 @@ } static void -change_password_cb(GaimAccount *account, GaimRequestFields *fields) +change_password_cb(PurpleAccount *account, PurpleRequestFields *fields) { const char *orig_pass, *new_pass_1, *new_pass_2; - orig_pass = gaim_request_fields_get_string(fields, "password"); - new_pass_1 = gaim_request_fields_get_string(fields, "new_password_1"); - new_pass_2 = gaim_request_fields_get_string(fields, "new_password_2"); + orig_pass = purple_request_fields_get_string(fields, "password"); + new_pass_1 = purple_request_fields_get_string(fields, "new_password_1"); + new_pass_2 = purple_request_fields_get_string(fields, "new_password_2"); if (g_utf8_collate(new_pass_1, new_pass_2)) { - gaim_notify_error(account, NULL, + purple_notify_error(account, NULL, _("New passwords do not match."), NULL); return; @@ -1159,56 +1159,56 @@ if (orig_pass == NULL || new_pass_1 == NULL || new_pass_2 == NULL || *orig_pass == '\0' || *new_pass_1 == '\0' || *new_pass_2 == '\0') { - gaim_notify_error(account, NULL, + purple_notify_error(account, NULL, _("Fill out all fields completely."), NULL); return; } - gaim_account_change_password(account, orig_pass, new_pass_1); + purple_account_change_password(account, orig_pass, new_pass_1); } void -gaim_account_request_change_password(GaimAccount *account) +purple_account_request_change_password(PurpleAccount *account) { - GaimRequestFields *fields; - GaimRequestFieldGroup *group; - GaimRequestField *field; + PurpleRequestFields *fields; + PurpleRequestFieldGroup *group; + PurpleRequestField *field; char primary[256]; g_return_if_fail(account != NULL); - g_return_if_fail(gaim_account_is_connected(account)); - - fields = gaim_request_fields_new(); - - group = gaim_request_field_group_new(NULL); - gaim_request_fields_add_group(fields, group); - - field = gaim_request_field_string_new("password", _("Original password"), + g_return_if_fail(purple_account_is_connected(account)); + + fields = purple_request_fields_new(); + + group = purple_request_field_group_new(NULL); + purple_request_fields_add_group(fields, group); + + field = purple_request_field_string_new("password", _("Original password"), NULL, FALSE); - gaim_request_field_string_set_masked(field, TRUE); - gaim_request_field_set_required(field, TRUE); - gaim_request_field_group_add_field(group, field); - - field = gaim_request_field_string_new("new_password_1", + purple_request_field_string_set_masked(field, TRUE); + purple_request_field_set_required(field, TRUE); + purple_request_field_group_add_field(group, field); + + field = purple_request_field_string_new("new_password_1", _("New password"), NULL, FALSE); - gaim_request_field_string_set_masked(field, TRUE); - gaim_request_field_set_required(field, TRUE); - gaim_request_field_group_add_field(group, field); - - field = gaim_request_field_string_new("new_password_2", + purple_request_field_string_set_masked(field, TRUE); + purple_request_field_set_required(field, TRUE); + purple_request_field_group_add_field(group, field); + + field = purple_request_field_string_new("new_password_2", _("New password (again)"), NULL, FALSE); - gaim_request_field_string_set_masked(field, TRUE); - gaim_request_field_set_required(field, TRUE); - gaim_request_field_group_add_field(group, field); + purple_request_field_string_set_masked(field, TRUE); + purple_request_field_set_required(field, TRUE); + purple_request_field_group_add_field(group, field); g_snprintf(primary, sizeof(primary), _("Change password for %s"), - gaim_account_get_username(account)); + purple_account_get_username(account)); /* I'm sticking this somewhere in the code: bologna */ - gaim_request_fields(gaim_account_get_connection(account), + purple_request_fields(purple_account_get_connection(account), NULL, primary, _("Please enter your current password and your " @@ -1220,40 +1220,40 @@ } static void -set_user_info_cb(GaimAccount *account, const char *user_info) +set_user_info_cb(PurpleAccount *account, const char *user_info) { - GaimConnection *gc; - - gaim_account_set_user_info(account, user_info); - gc = gaim_account_get_connection(account); + PurpleConnection *gc; + + purple_account_set_user_info(account, user_info); + gc = purple_account_get_connection(account); serv_set_info(gc, user_info); } void -gaim_account_request_change_user_info(GaimAccount *account) +purple_account_request_change_user_info(PurpleAccount *account) { - GaimConnection *gc; + PurpleConnection *gc; char primary[256]; g_return_if_fail(account != NULL); - g_return_if_fail(gaim_account_is_connected(account)); - - gc = gaim_account_get_connection(account); + g_return_if_fail(purple_account_is_connected(account)); + + gc = purple_account_get_connection(account); g_snprintf(primary, sizeof(primary), _("Change user information for %s"), - gaim_account_get_username(account)); - - gaim_request_input(gc, _("Set User Info"), primary, NULL, - gaim_account_get_user_info(account), + purple_account_get_username(account)); + + purple_request_input(gc, _("Set User Info"), primary, NULL, + purple_account_get_user_info(account), TRUE, FALSE, ((gc != NULL) && - (gc->flags & GAIM_CONNECTION_HTML) ? "html" : NULL), + (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL), _("Save"), G_CALLBACK(set_user_info_cb), _("Cancel"), NULL, account); } void -gaim_account_set_username(GaimAccount *account, const char *username) +purple_account_set_username(PurpleAccount *account, const char *username) { g_return_if_fail(account != NULL); @@ -1264,11 +1264,11 @@ /* if the name changes, we should re-write the buddy list * to disk with the new name */ - gaim_blist_schedule_save(); + purple_blist_schedule_save(); } void -gaim_account_set_password(GaimAccount *account, const char *password) +purple_account_set_password(PurpleAccount *account, const char *password) { g_return_if_fail(account != NULL); @@ -1279,7 +1279,7 @@ } void -gaim_account_set_alias(GaimAccount *account, const char *alias) +purple_account_set_alias(PurpleAccount *account, const char *alias) { g_return_if_fail(account != NULL); @@ -1296,7 +1296,7 @@ char *old = account->alias; account->alias = g_strdup(alias); - gaim_signal_emit(gaim_accounts_get_handle(), "account-alias-changed", + purple_signal_emit(purple_accounts_get_handle(), "account-alias-changed", account, old); g_free(old); @@ -1305,7 +1305,7 @@ } void -gaim_account_set_user_info(GaimAccount *account, const char *user_info) +purple_account_set_user_info(PurpleAccount *account, const char *user_info) { g_return_if_fail(account != NULL); @@ -1316,14 +1316,14 @@ } void -gaim_account_set_buddy_icon(GaimAccount *account, const char *icon) +purple_account_set_buddy_icon(PurpleAccount *account, const char *icon) { g_return_if_fail(account != NULL); /* Delete an existing icon from the cache. */ if (account->buddy_icon != NULL && (icon == NULL || strcmp(account->buddy_icon, icon))) { - const char *dirname = gaim_buddy_icons_get_cache_dir(); + const char *dirname = purple_buddy_icons_get_cache_dir(); if (g_file_test(account->buddy_icon, G_FILE_TEST_IS_REGULAR)) { @@ -1346,17 +1346,17 @@ g_free(account->buddy_icon); account->buddy_icon = g_strdup(icon); - if (gaim_account_is_connected(account)) + if (purple_account_is_connected(account)) { - GaimConnection *gc; - GaimPluginProtocolInfo *prpl_info; - - gc = gaim_account_get_connection(account); - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + PurpleConnection *gc; + PurplePluginProtocolInfo *prpl_info; + + gc = purple_account_get_connection(account); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info && prpl_info->set_buddy_icon) { - char *cached_path = gaim_buddy_icons_get_full_path(icon); + char *cached_path = purple_buddy_icons_get_full_path(icon); prpl_info->set_buddy_icon(gc, cached_path); g_free(cached_path); } @@ -1365,7 +1365,7 @@ schedule_accounts_save(); } -void gaim_account_set_buddy_icon_path(GaimAccount *account, const char *path) +void purple_account_set_buddy_icon_path(PurpleAccount *account, const char *path) { g_return_if_fail(account != NULL); @@ -1376,7 +1376,7 @@ } void -gaim_account_set_protocol_id(GaimAccount *account, const char *protocol_id) +purple_account_set_protocol_id(PurpleAccount *account, const char *protocol_id) { g_return_if_fail(account != NULL); g_return_if_fail(protocol_id != NULL); @@ -1388,7 +1388,7 @@ } void -gaim_account_set_connection(GaimAccount *account, GaimConnection *gc) +purple_account_set_connection(PurpleAccount *account, PurpleConnection *gc) { g_return_if_fail(account != NULL); @@ -1396,7 +1396,7 @@ } void -gaim_account_set_remember_password(GaimAccount *account, gboolean value) +purple_account_set_remember_password(PurpleAccount *account, gboolean value) { g_return_if_fail(account != NULL); @@ -1406,49 +1406,49 @@ } void -gaim_account_set_check_mail(GaimAccount *account, gboolean value) +purple_account_set_check_mail(PurpleAccount *account, gboolean value) { g_return_if_fail(account != NULL); - gaim_account_set_bool(account, "check-mail", value); + purple_account_set_bool(account, "check-mail", value); } void -gaim_account_set_enabled(GaimAccount *account, const char *ui, +purple_account_set_enabled(PurpleAccount *account, const char *ui, gboolean value) { - GaimConnection *gc; + PurpleConnection *gc; gboolean was_enabled = FALSE; g_return_if_fail(account != NULL); g_return_if_fail(ui != NULL); - was_enabled = gaim_account_get_enabled(account, ui); - - gaim_account_set_ui_bool(account, ui, "auto-login", value); - gc = gaim_account_get_connection(account); + was_enabled = purple_account_get_enabled(account, ui); + + purple_account_set_ui_bool(account, ui, "auto-login", value); + gc = purple_account_get_connection(account); if(was_enabled && !value) - gaim_signal_emit(gaim_accounts_get_handle(), "account-disabled", account); + purple_signal_emit(purple_accounts_get_handle(), "account-disabled", account); else if(!was_enabled && value) - gaim_signal_emit(gaim_accounts_get_handle(), "account-enabled", account); + purple_signal_emit(purple_accounts_get_handle(), "account-enabled", account); if ((gc != NULL) && (gc->wants_to_die == TRUE)) return; - if (value && gaim_presence_is_online(account->presence)) - gaim_account_connect(account); - else if (!value && !gaim_account_is_disconnected(account)) - gaim_account_disconnect(account); + if (value && purple_presence_is_online(account->presence)) + purple_account_connect(account); + else if (!value && !purple_account_is_disconnected(account)) + purple_account_disconnect(account); } void -gaim_account_set_proxy_info(GaimAccount *account, GaimProxyInfo *info) +purple_account_set_proxy_info(PurpleAccount *account, PurpleProxyInfo *info) { g_return_if_fail(account != NULL); if (account->proxy_info != NULL) - gaim_proxy_info_destroy(account->proxy_info); + purple_proxy_info_destroy(account->proxy_info); account->proxy_info = info; @@ -1456,14 +1456,14 @@ } void -gaim_account_set_status_types(GaimAccount *account, GList *status_types) +purple_account_set_status_types(PurpleAccount *account, GList *status_types) { g_return_if_fail(account != NULL); /* Out with the old... */ if (account->status_types != NULL) { - g_list_foreach(account->status_types, (GFunc)gaim_status_type_destroy, NULL); + g_list_foreach(account->status_types, (GFunc)purple_status_type_destroy, NULL); g_list_free(account->status_types); } @@ -1472,7 +1472,7 @@ } void -gaim_account_set_status(GaimAccount *account, const char *status_id, +purple_account_set_status(PurpleAccount *account, const char *status_id, gboolean active, ...) { GList *attrs = NULL; @@ -1487,32 +1487,32 @@ data = va_arg(args, void *); attrs = g_list_append(attrs, data); } - gaim_account_set_status_list(account, status_id, active, attrs); + purple_account_set_status_list(account, status_id, active, attrs); g_list_free(attrs); va_end(args); } void -gaim_account_set_status_list(GaimAccount *account, const char *status_id, +purple_account_set_status_list(PurpleAccount *account, const char *status_id, gboolean active, GList *attrs) { - GaimStatus *status; + PurpleStatus *status; g_return_if_fail(account != NULL); g_return_if_fail(status_id != NULL); - status = gaim_account_get_status(account, status_id); + status = purple_account_get_status(account, status_id); if (status == NULL) { - gaim_debug_error("account", + purple_debug_error("account", "Invalid status ID %s for account %s (%s)\n", - status_id, gaim_account_get_username(account), - gaim_account_get_protocol_id(account)); + status_id, purple_account_get_username(account), + purple_account_get_protocol_id(account)); return; } - if (active || gaim_status_is_independent(status)) - gaim_status_set_active_with_attrs_list(status, active, attrs); + if (active || purple_status_is_independent(status)) + purple_status_set_active_with_attrs_list(status, active, attrs); /* * Our current statuses are saved to accounts.xml (so that when we @@ -1522,7 +1522,7 @@ } void -gaim_account_clear_settings(GaimAccount *account) +purple_account_clear_settings(PurpleAccount *account) { g_return_if_fail(account != NULL); @@ -1533,16 +1533,16 @@ } void -gaim_account_set_int(GaimAccount *account, const char *name, int value) +purple_account_set_int(PurpleAccount *account, const char *name, int value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; g_return_if_fail(account != NULL); g_return_if_fail(name != NULL); - setting = g_new0(GaimAccountSetting, 1); - - setting->type = GAIM_PREF_INT; + setting = g_new0(PurpleAccountSetting, 1); + + setting->type = PURPLE_PREF_INT; setting->value.integer = value; g_hash_table_insert(account->settings, g_strdup(name), setting); @@ -1551,17 +1551,17 @@ } void -gaim_account_set_string(GaimAccount *account, const char *name, +purple_account_set_string(PurpleAccount *account, const char *name, const char *value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; g_return_if_fail(account != NULL); g_return_if_fail(name != NULL); - setting = g_new0(GaimAccountSetting, 1); - - setting->type = GAIM_PREF_STRING; + setting = g_new0(PurpleAccountSetting, 1); + + setting->type = PURPLE_PREF_STRING; setting->value.string = g_strdup(value); g_hash_table_insert(account->settings, g_strdup(name), setting); @@ -1570,16 +1570,16 @@ } void -gaim_account_set_bool(GaimAccount *account, const char *name, gboolean value) +purple_account_set_bool(PurpleAccount *account, const char *name, gboolean value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; g_return_if_fail(account != NULL); g_return_if_fail(name != NULL); - setting = g_new0(GaimAccountSetting, 1); - - setting->type = GAIM_PREF_BOOLEAN; + setting = g_new0(PurpleAccountSetting, 1); + + setting->type = PURPLE_PREF_BOOLEAN; setting->value.bool = value; g_hash_table_insert(account->settings, g_strdup(name), setting); @@ -1588,7 +1588,7 @@ } static GHashTable * -get_ui_settings_table(GaimAccount *account, const char *ui) +get_ui_settings_table(PurpleAccount *account, const char *ui) { GHashTable *table; @@ -1604,19 +1604,19 @@ } void -gaim_account_set_ui_int(GaimAccount *account, const char *ui, +purple_account_set_ui_int(PurpleAccount *account, const char *ui, const char *name, int value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; GHashTable *table; g_return_if_fail(account != NULL); g_return_if_fail(ui != NULL); g_return_if_fail(name != NULL); - setting = g_new0(GaimAccountSetting, 1); - - setting->type = GAIM_PREF_INT; + setting = g_new0(PurpleAccountSetting, 1); + + setting->type = PURPLE_PREF_INT; setting->ui = g_strdup(ui); setting->value.integer = value; @@ -1628,19 +1628,19 @@ } void -gaim_account_set_ui_string(GaimAccount *account, const char *ui, +purple_account_set_ui_string(PurpleAccount *account, const char *ui, const char *name, const char *value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; GHashTable *table; g_return_if_fail(account != NULL); g_return_if_fail(ui != NULL); g_return_if_fail(name != NULL); - setting = g_new0(GaimAccountSetting, 1); - - setting->type = GAIM_PREF_STRING; + setting = g_new0(PurpleAccountSetting, 1); + + setting->type = PURPLE_PREF_STRING; setting->ui = g_strdup(ui); setting->value.string = g_strdup(value); @@ -1652,19 +1652,19 @@ } void -gaim_account_set_ui_bool(GaimAccount *account, const char *ui, +purple_account_set_ui_bool(PurpleAccount *account, const char *ui, const char *name, gboolean value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; GHashTable *table; g_return_if_fail(account != NULL); g_return_if_fail(ui != NULL); g_return_if_fail(name != NULL); - setting = g_new0(GaimAccountSetting, 1); - - setting->type = GAIM_PREF_BOOLEAN; + setting = g_new0(PurpleAccountSetting, 1); + + setting->type = PURPLE_PREF_BOOLEAN; setting->ui = g_strdup(ui); setting->value.bool = value; @@ -1675,40 +1675,40 @@ schedule_accounts_save(); } -static GaimConnectionState -gaim_account_get_state(const GaimAccount *account) +static PurpleConnectionState +purple_account_get_state(const PurpleAccount *account) { - GaimConnection *gc; - - g_return_val_if_fail(account != NULL, GAIM_DISCONNECTED); - - gc = gaim_account_get_connection(account); + PurpleConnection *gc; + + g_return_val_if_fail(account != NULL, PURPLE_DISCONNECTED); + + gc = purple_account_get_connection(account); if (!gc) - return GAIM_DISCONNECTED; - - return gaim_connection_get_state(gc); + return PURPLE_DISCONNECTED; + + return purple_connection_get_state(gc); } gboolean -gaim_account_is_connected(const GaimAccount *account) +purple_account_is_connected(const PurpleAccount *account) { - return (gaim_account_get_state(account) == GAIM_CONNECTED); + return (purple_account_get_state(account) == PURPLE_CONNECTED); } gboolean -gaim_account_is_connecting(const GaimAccount *account) +purple_account_is_connecting(const PurpleAccount *account) { - return (gaim_account_get_state(account) == GAIM_CONNECTING); + return (purple_account_get_state(account) == PURPLE_CONNECTING); } gboolean -gaim_account_is_disconnected(const GaimAccount *account) +purple_account_is_disconnected(const PurpleAccount *account) { - return (gaim_account_get_state(account) == GAIM_DISCONNECTED); + return (purple_account_get_state(account) == PURPLE_DISCONNECTED); } const char * -gaim_account_get_username(const GaimAccount *account) +purple_account_get_username(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1716,7 +1716,7 @@ } const char * -gaim_account_get_password(const GaimAccount *account) +purple_account_get_password(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1724,7 +1724,7 @@ } const char * -gaim_account_get_alias(const GaimAccount *account) +purple_account_get_alias(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1732,7 +1732,7 @@ } const char * -gaim_account_get_user_info(const GaimAccount *account) +purple_account_get_user_info(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1740,7 +1740,7 @@ } const char * -gaim_account_get_buddy_icon(const GaimAccount *account) +purple_account_get_buddy_icon(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1748,7 +1748,7 @@ } const char * -gaim_account_get_buddy_icon_path(const GaimAccount *account) +purple_account_get_buddy_icon_path(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1756,7 +1756,7 @@ } const char * -gaim_account_get_protocol_id(const GaimAccount *account) +purple_account_get_protocol_id(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); /* @@ -1772,19 +1772,19 @@ } const char * -gaim_account_get_protocol_name(const GaimAccount *account) +purple_account_get_protocol_name(const PurpleAccount *account) { - GaimPlugin *p; + PurplePlugin *p; g_return_val_if_fail(account != NULL, NULL); - p = gaim_find_prpl(gaim_account_get_protocol_id(account)); + p = purple_find_prpl(purple_account_get_protocol_id(account)); return ((p && p->info->name) ? _(p->info->name) : _("Unknown")); } -GaimConnection * -gaim_account_get_connection(const GaimAccount *account) +PurpleConnection * +purple_account_get_connection(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1792,7 +1792,7 @@ } gboolean -gaim_account_get_remember_password(const GaimAccount *account) +purple_account_get_remember_password(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, FALSE); @@ -1800,86 +1800,86 @@ } gboolean -gaim_account_get_check_mail(const GaimAccount *account) +purple_account_get_check_mail(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, FALSE); - return gaim_account_get_bool(account, "check-mail", FALSE); + return purple_account_get_bool(account, "check-mail", FALSE); } gboolean -gaim_account_get_enabled(const GaimAccount *account, const char *ui) +purple_account_get_enabled(const PurpleAccount *account, const char *ui) { g_return_val_if_fail(account != NULL, FALSE); g_return_val_if_fail(ui != NULL, FALSE); - return gaim_account_get_ui_bool(account, ui, "auto-login", FALSE); + return purple_account_get_ui_bool(account, ui, "auto-login", FALSE); } -GaimProxyInfo * -gaim_account_get_proxy_info(const GaimAccount *account) +PurpleProxyInfo * +purple_account_get_proxy_info(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); return account->proxy_info; } -GaimStatus * -gaim_account_get_active_status(const GaimAccount *account) +PurpleStatus * +purple_account_get_active_status(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); - return gaim_presence_get_active_status(account->presence); + return purple_presence_get_active_status(account->presence); } -GaimStatus * -gaim_account_get_status(const GaimAccount *account, const char *status_id) +PurpleStatus * +purple_account_get_status(const PurpleAccount *account, const char *status_id) { g_return_val_if_fail(account != NULL, NULL); g_return_val_if_fail(status_id != NULL, NULL); - return gaim_presence_get_status(account->presence, status_id); + return purple_presence_get_status(account->presence, status_id); } -GaimStatusType * -gaim_account_get_status_type(const GaimAccount *account, const char *id) +PurpleStatusType * +purple_account_get_status_type(const PurpleAccount *account, const char *id) { const GList *l; g_return_val_if_fail(account != NULL, NULL); g_return_val_if_fail(id != NULL, NULL); - for (l = gaim_account_get_status_types(account); l != NULL; l = l->next) + for (l = purple_account_get_status_types(account); l != NULL; l = l->next) { - GaimStatusType *status_type = (GaimStatusType *)l->data; - - if (!strcmp(gaim_status_type_get_id(status_type), id)) + PurpleStatusType *status_type = (PurpleStatusType *)l->data; + + if (!strcmp(purple_status_type_get_id(status_type), id)) return status_type; } return NULL; } -GaimStatusType * -gaim_account_get_status_type_with_primitive(const GaimAccount *account, GaimStatusPrimitive primitive) +PurpleStatusType * +purple_account_get_status_type_with_primitive(const PurpleAccount *account, PurpleStatusPrimitive primitive) { const GList *l; g_return_val_if_fail(account != NULL, NULL); - for (l = gaim_account_get_status_types(account); l != NULL; l = l->next) + for (l = purple_account_get_status_types(account); l != NULL; l = l->next) { - GaimStatusType *status_type = (GaimStatusType *)l->data; - - if (gaim_status_type_get_primitive(status_type) == primitive) + PurpleStatusType *status_type = (PurpleStatusType *)l->data; + + if (purple_status_type_get_primitive(status_type) == primitive) return status_type; } return NULL; } -GaimPresence * -gaim_account_get_presence(const GaimAccount *account) +PurplePresence * +purple_account_get_presence(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1887,17 +1887,17 @@ } gboolean -gaim_account_is_status_active(const GaimAccount *account, +purple_account_is_status_active(const PurpleAccount *account, const char *status_id) { g_return_val_if_fail(account != NULL, FALSE); g_return_val_if_fail(status_id != NULL, FALSE); - return gaim_presence_is_status_active(account->presence, status_id); + return purple_presence_is_status_active(account->presence, status_id); } const GList * -gaim_account_get_status_types(const GaimAccount *account) +purple_account_get_status_types(const PurpleAccount *account) { g_return_val_if_fail(account != NULL, NULL); @@ -1905,10 +1905,10 @@ } int -gaim_account_get_int(const GaimAccount *account, const char *name, +purple_account_get_int(const PurpleAccount *account, const char *name, int default_value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; g_return_val_if_fail(account != NULL, default_value); g_return_val_if_fail(name != NULL, default_value); @@ -1918,16 +1918,16 @@ if (setting == NULL) return default_value; - g_return_val_if_fail(setting->type == GAIM_PREF_INT, default_value); + g_return_val_if_fail(setting->type == PURPLE_PREF_INT, default_value); return setting->value.integer; } const char * -gaim_account_get_string(const GaimAccount *account, const char *name, +purple_account_get_string(const PurpleAccount *account, const char *name, const char *default_value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; g_return_val_if_fail(account != NULL, default_value); g_return_val_if_fail(name != NULL, default_value); @@ -1937,16 +1937,16 @@ if (setting == NULL) return default_value; - g_return_val_if_fail(setting->type == GAIM_PREF_STRING, default_value); + g_return_val_if_fail(setting->type == PURPLE_PREF_STRING, default_value); return setting->value.string; } gboolean -gaim_account_get_bool(const GaimAccount *account, const char *name, +purple_account_get_bool(const PurpleAccount *account, const char *name, gboolean default_value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; g_return_val_if_fail(account != NULL, default_value); g_return_val_if_fail(name != NULL, default_value); @@ -1956,16 +1956,16 @@ if (setting == NULL) return default_value; - g_return_val_if_fail(setting->type == GAIM_PREF_BOOLEAN, default_value); + g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value); return setting->value.bool; } int -gaim_account_get_ui_int(const GaimAccount *account, const char *ui, +purple_account_get_ui_int(const PurpleAccount *account, const char *ui, const char *name, int default_value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; GHashTable *table; g_return_val_if_fail(account != NULL, default_value); @@ -1978,16 +1978,16 @@ if ((setting = g_hash_table_lookup(table, name)) == NULL) return default_value; - g_return_val_if_fail(setting->type == GAIM_PREF_INT, default_value); + g_return_val_if_fail(setting->type == PURPLE_PREF_INT, default_value); return setting->value.integer; } const char * -gaim_account_get_ui_string(const GaimAccount *account, const char *ui, +purple_account_get_ui_string(const PurpleAccount *account, const char *ui, const char *name, const char *default_value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; GHashTable *table; g_return_val_if_fail(account != NULL, default_value); @@ -2000,16 +2000,16 @@ if ((setting = g_hash_table_lookup(table, name)) == NULL) return default_value; - g_return_val_if_fail(setting->type == GAIM_PREF_STRING, default_value); + g_return_val_if_fail(setting->type == PURPLE_PREF_STRING, default_value); return setting->value.string; } gboolean -gaim_account_get_ui_bool(const GaimAccount *account, const char *ui, +purple_account_get_ui_bool(const PurpleAccount *account, const char *ui, const char *name, gboolean default_value) { - GaimAccountSetting *setting; + PurpleAccountSetting *setting; GHashTable *table; g_return_val_if_fail(account != NULL, default_value); @@ -2022,25 +2022,25 @@ if ((setting = g_hash_table_lookup(table, name)) == NULL) return default_value; - g_return_val_if_fail(setting->type == GAIM_PREF_BOOLEAN, default_value); + g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value); return setting->value.bool; } -GaimLog * -gaim_account_get_log(GaimAccount *account, gboolean create) +PurpleLog * +purple_account_get_log(PurpleAccount *account, gboolean create) { g_return_val_if_fail(account != NULL, NULL); if(!account->system_log && create){ - GaimPresence *presence; + PurplePresence *presence; int login_time; - presence = gaim_account_get_presence(account); - login_time = gaim_presence_get_login_time(presence); - - account->system_log = gaim_log_new(GAIM_LOG_SYSTEM, - gaim_account_get_username(account), account, NULL, + presence = purple_account_get_presence(account); + login_time = purple_presence_get_login_time(presence); + + account->system_log = purple_log_new(PURPLE_LOG_SYSTEM, + purple_account_get_username(account), account, NULL, (login_time != 0) ? login_time : time(NULL), NULL); } @@ -2048,44 +2048,44 @@ } void -gaim_account_destroy_log(GaimAccount *account) +purple_account_destroy_log(PurpleAccount *account) { g_return_if_fail(account != NULL); if(account->system_log){ - gaim_log_free(account->system_log); + purple_log_free(account->system_log); account->system_log = NULL; } } void -gaim_account_add_buddy(GaimAccount *account, GaimBuddy *buddy) +purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = gaim_account_get_connection(account); + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = purple_account_get_connection(account); if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info != NULL && prpl_info->add_buddy != NULL) - prpl_info->add_buddy(gc, buddy, gaim_buddy_get_group(buddy)); + prpl_info->add_buddy(gc, buddy, purple_buddy_get_group(buddy)); } void -gaim_account_add_buddies(GaimAccount *account, GList *buddies) +purple_account_add_buddies(PurpleAccount *account, GList *buddies) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = gaim_account_get_connection(account); + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = purple_account_get_connection(account); if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info) { GList *cur, *groups = NULL; /* Make a list of what group each buddy is in */ for (cur = buddies; cur != NULL; cur = cur->next) { - GaimBlistNode *node = cur->data; + PurpleBlistNode *node = cur->data; groups = g_list_append(groups, node->parent->parent); } @@ -2106,27 +2106,27 @@ } void -gaim_account_remove_buddy(GaimAccount *account, GaimBuddy *buddy, - GaimGroup *group) +purple_account_remove_buddy(PurpleAccount *account, PurpleBuddy *buddy, + PurpleGroup *group) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = gaim_account_get_connection(account); + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = purple_account_get_connection(account); if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info && prpl_info->remove_buddy) prpl_info->remove_buddy(gc, buddy, group); } void -gaim_account_remove_buddies(GaimAccount *account, GList *buddies, GList *groups) +purple_account_remove_buddies(PurpleAccount *account, GList *buddies, GList *groups) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = gaim_account_get_connection(account); + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = purple_account_get_connection(account); if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info) { if (prpl_info->remove_buddies) @@ -2135,7 +2135,7 @@ GList *curb = buddies; GList *curg = groups; while ((curb != NULL) && (curg != NULL)) { - gaim_account_remove_buddy(account, curb->data, curg->data); + purple_account_remove_buddy(account, curb->data, curg->data); curb = curb->next; curg = curg->next; } @@ -2144,47 +2144,47 @@ } void -gaim_account_remove_group(GaimAccount *account, GaimGroup *group) +purple_account_remove_group(PurpleAccount *account, PurpleGroup *group) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = gaim_account_get_connection(account); + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = purple_account_get_connection(account); if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info && prpl_info->remove_group) prpl_info->remove_group(gc, group); } void -gaim_account_change_password(GaimAccount *account, const char *orig_pw, +purple_account_change_password(PurpleAccount *account, const char *orig_pw, const char *new_pw) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = gaim_account_get_connection(account); - - gaim_account_set_password(account, new_pw); + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = purple_account_get_connection(account); + + purple_account_set_password(account, new_pw); if (gc != NULL && gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (prpl_info && prpl_info->change_passwd) prpl_info->change_passwd(gc, orig_pw, new_pw); } -gboolean gaim_account_supports_offline_message(GaimAccount *account, GaimBuddy *buddy) +gboolean purple_account_supports_offline_message(PurpleAccount *account, PurpleBuddy *buddy) { - GaimConnection *gc; - GaimPluginProtocolInfo *prpl_info; + PurpleConnection *gc; + PurplePluginProtocolInfo *prpl_info; g_return_val_if_fail(account, FALSE); g_return_val_if_fail(buddy, FALSE); - gc = gaim_account_get_connection(account); + gc = purple_account_get_connection(account); if (gc == NULL) return FALSE; - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); if (!prpl_info || !prpl_info->offline_message) return FALSE; @@ -2192,7 +2192,7 @@ } void -gaim_accounts_add(GaimAccount *account) +purple_accounts_add(PurpleAccount *account) { g_return_if_fail(account != NULL); @@ -2203,11 +2203,11 @@ schedule_accounts_save(); - gaim_signal_emit(gaim_accounts_get_handle(), "account-added", account); + purple_signal_emit(purple_accounts_get_handle(), "account-added", account); } void -gaim_accounts_remove(GaimAccount *account) +purple_accounts_remove(PurpleAccount *account) { g_return_if_fail(account != NULL); @@ -2215,13 +2215,13 @@ schedule_accounts_save(); - gaim_signal_emit(gaim_accounts_get_handle(), "account-removed", account); + purple_signal_emit(purple_accounts_get_handle(), "account-removed", account); } void -gaim_accounts_delete(GaimAccount *account) +purple_accounts_delete(PurpleAccount *account) { - GaimBlistNode *gnode, *cnode, *bnode; + PurpleBlistNode *gnode, *cnode, *bnode; g_return_if_fail(account != NULL); @@ -2231,56 +2231,56 @@ * account for all UIs rather than the just the current UI, * but it doesn't really matter. */ - gaim_account_set_enabled(account, gaim_core_get_ui(), FALSE); - - gaim_notify_close_with_handle(account); - gaim_request_close_with_handle(account); - - gaim_accounts_remove(account); + purple_account_set_enabled(account, purple_core_get_ui(), FALSE); + + purple_notify_close_with_handle(account); + purple_request_close_with_handle(account); + + purple_accounts_remove(account); /* Remove this account's buddies */ - for (gnode = gaim_get_blist()->root; gnode != NULL; gnode = gnode->next) { - if (!GAIM_BLIST_NODE_IS_GROUP(gnode)) + for (gnode = purple_get_blist()->root; gnode != NULL; gnode = gnode->next) { + if (!PURPLE_BLIST_NODE_IS_GROUP(gnode)) continue; cnode = gnode->child; while (cnode) { - GaimBlistNode *cnode_next = cnode->next; - - if(GAIM_BLIST_NODE_IS_CONTACT(cnode)) { + PurpleBlistNode *cnode_next = cnode->next; + + if(PURPLE_BLIST_NODE_IS_CONTACT(cnode)) { bnode = cnode->child; while (bnode) { - GaimBlistNode *bnode_next = bnode->next; - - if (GAIM_BLIST_NODE_IS_BUDDY(bnode)) { - GaimBuddy *b = (GaimBuddy *)bnode; + PurpleBlistNode *bnode_next = bnode->next; + + if (PURPLE_BLIST_NODE_IS_BUDDY(bnode)) { + PurpleBuddy *b = (PurpleBuddy *)bnode; if (b->account == account) - gaim_blist_remove_buddy(b); + purple_blist_remove_buddy(b); } bnode = bnode_next; } - } else if (GAIM_BLIST_NODE_IS_CHAT(cnode)) { - GaimChat *c = (GaimChat *)cnode; + } else if (PURPLE_BLIST_NODE_IS_CHAT(cnode)) { + PurpleChat *c = (PurpleChat *)cnode; if (c->account == account) - gaim_blist_remove_chat(c); + purple_blist_remove_chat(c); } cnode = cnode_next; } } /* Remove this account's pounces */ - gaim_pounce_destroy_all_by_account(account); + purple_pounce_destroy_all_by_account(account); /* This will cause the deletion of an old buddy icon. */ - gaim_account_set_buddy_icon(account, NULL); - - gaim_account_destroy(account); + purple_account_set_buddy_icon(account, NULL); + + purple_account_destroy(account); } void -gaim_accounts_reorder(GaimAccount *account, gint new_index) +purple_accounts_reorder(PurpleAccount *account, gint new_index) { gint index; GList *l; @@ -2291,9 +2291,9 @@ index = g_list_index(accounts, account); if (index == -1) { - gaim_debug_error("account", + purple_debug_error("account", "Unregistered account (%s) discovered during reorder!\n", - gaim_account_get_username(account)); + purple_account_get_username(account)); return; } @@ -2312,21 +2312,21 @@ } GList * -gaim_accounts_get_all(void) +purple_accounts_get_all(void) { return accounts; } GList * -gaim_accounts_get_all_active(void) +purple_accounts_get_all_active(void) { GList *list = NULL; - GList *all = gaim_accounts_get_all(); + GList *all = purple_accounts_get_all(); while (all != NULL) { - GaimAccount *account = all->data; - - if (gaim_account_get_enabled(account, gaim_core_get_ui())) + PurpleAccount *account = all->data; + + if (purple_account_get_enabled(account, purple_core_get_ui())) list = g_list_append(list, account); all = all->next; @@ -2335,21 +2335,21 @@ return list; } -GaimAccount * -gaim_accounts_find(const char *name, const char *protocol_id) +PurpleAccount * +purple_accounts_find(const char *name, const char *protocol_id) { - GaimAccount *account = NULL; + PurpleAccount *account = NULL; GList *l; char *who; g_return_val_if_fail(name != NULL, NULL); - who = g_strdup(gaim_normalize(NULL, name)); - - for (l = gaim_accounts_get_all(); l != NULL; l = l->next) { - account = (GaimAccount *)l->data; - - if (!strcmp(gaim_normalize(NULL, gaim_account_get_username(account)), who) && + who = g_strdup(purple_normalize(NULL, name)); + + for (l = purple_accounts_get_all(); l != NULL; l = l->next) { + account = (PurpleAccount *)l->data; + + if (!strcmp(purple_normalize(NULL, purple_account_get_username(account)), who) && (!protocol_id || !strcmp(account->protocol_id, protocol_id))) { break; @@ -2364,43 +2364,43 @@ } void -gaim_accounts_restore_current_statuses() +purple_accounts_restore_current_statuses() { GList *l; - GaimAccount *account; + PurpleAccount *account; /* If we're not connected to the Internet right now, we bail on this */ - if (!gaim_network_is_available()) + if (!purple_network_is_available()) { - gaim_debug_info("account", "Network not connected; skipping reconnect\n"); + purple_debug_info("account", "Network not connected; skipping reconnect\n"); return; } - for (l = gaim_accounts_get_all(); l != NULL; l = l->next) + for (l = purple_accounts_get_all(); l != NULL; l = l->next) { - account = (GaimAccount *)l->data; - if (gaim_account_get_enabled(account, gaim_core_get_ui()) && - (gaim_presence_is_online(account->presence))) + account = (PurpleAccount *)l->data; + if (purple_account_get_enabled(account, purple_core_get_ui()) && + (purple_presence_is_online(account->presence))) { - gaim_account_connect(account); + purple_account_connect(account); } } } void -gaim_accounts_set_ui_ops(GaimAccountUiOps *ops) +purple_accounts_set_ui_ops(PurpleAccountUiOps *ops) { account_ui_ops = ops; } -GaimAccountUiOps * -gaim_accounts_get_ui_ops(void) +PurpleAccountUiOps * +purple_accounts_get_ui_ops(void) { return account_ui_ops; } void * -gaim_accounts_get_handle(void) +purple_accounts_get_handle(void) { static int handle; @@ -2408,73 +2408,73 @@ } void -gaim_accounts_init(void) +purple_accounts_init(void) { - void *handle = gaim_accounts_get_handle(); - - gaim_signal_register(handle, "account-connecting", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT)); - - gaim_signal_register(handle, "account-disabled", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT)); - - gaim_signal_register(handle, "account-enabled", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT)); - - gaim_signal_register(handle, "account-setting-info", - gaim_marshal_VOID__POINTER_POINTER, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "account-set-info", - gaim_marshal_VOID__POINTER_POINTER, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "account-added", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); - - gaim_signal_register(handle, "account-removed", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); - - gaim_signal_register(handle, "account-status-changed", - gaim_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_STATUS), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_STATUS)); - - gaim_signal_register(handle, "account-alias-changed", - gaim_marshal_VOID__POINTER_POINTER, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING)); + void *handle = purple_accounts_get_handle(); + + purple_signal_register(handle, "account-connecting", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT)); + + purple_signal_register(handle, "account-disabled", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT)); + + purple_signal_register(handle, "account-enabled", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT)); + + purple_signal_register(handle, "account-setting-info", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "account-set-info", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "account-added", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT)); + + purple_signal_register(handle, "account-removed", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT)); + + purple_signal_register(handle, "account-status-changed", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_STATUS), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_STATUS)); + + purple_signal_register(handle, "account-alias-changed", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING)); load_accounts(); } void -gaim_accounts_uninit(void) +purple_accounts_uninit(void) { if (save_timer != 0) { - gaim_timeout_remove(save_timer); + purple_timeout_remove(save_timer); save_timer = 0; sync_accounts(); } - gaim_signals_unregister_by_instance(gaim_accounts_get_handle()); + purple_signals_unregister_by_instance(purple_accounts_get_handle()); }