pidgin: c08b2df2: Use accessor functions in a few places
markdoliner at pidgin.im
markdoliner at pidgin.im
Tue Aug 23 00:42:44 EDT 2011
----------------------------------------------------------------------
Revision: c08b2df23a05ff9d6bf18ff352784afb431dba6b
Parent: e59c416200fb2aa6b0d35d6c537620adca42e6af
Author: markdoliner at pidgin.im
Date: 08/23/11 00:32:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c08b2df23a05ff9d6bf18ff352784afb431dba6b
Changelog:
Use accessor functions in a few places
Changes against parent e59c416200fb2aa6b0d35d6c537620adca42e6af
patched libpurple/plugins/log_reader.c
patched libpurple/protocols/bonjour/jabber.c
-------------- next part --------------
============================================================
--- libpurple/plugins/log_reader.c 1602ce008ed5b6d27c121e6ffc6c06193273cbbd
+++ libpurple/plugins/log_reader.c 0e8fd40140c600deaadeefb5ba8b02b1c6b20dc0
@@ -92,7 +92,7 @@ static GList *adium_logger_list(PurpleLo
prpl_name = g_ascii_strup(prpl_info->list_icon(account, NULL), -1);
- temp = g_strdup_printf("%s.%s", prpl_name, account->username);
+ temp = g_strdup_printf("%s.%s", prpl_name, purple_account_get_username(account));
path = g_build_filename(logdir, temp, sn, NULL);
g_free(temp);
@@ -635,7 +635,7 @@ static GList *msn_logger_list(PurpleLogT
g_return_val_if_fail(sn != NULL, NULL);
g_return_val_if_fail(account != NULL, NULL);
- if (strcmp(account->protocol_id, "prpl-msn"))
+ if (strcmp(purple_account_get_protocol_id(account), "prpl-msn"))
return NULL;
logdir = purple_prefs_get_string("/plugins/core/log_reader/msn/log_directory");
@@ -658,7 +658,7 @@ static GList *msn_logger_list(PurpleLogT
return list;
}
} else {
- username = g_strdup(purple_normalize(account, account->username));
+ username = g_strdup(purple_normalize(account, purple_account_get_username(account)));
}
if (buddy) {
@@ -974,7 +974,7 @@ static char * msn_logger_read (PurpleLog
their_name = from_name;
if (from_name && purple_prefs_get_bool("/plugins/core/log_reader/use_name_heuristics")) {
- const char *friendly_name = purple_connection_get_display_name(log->account->gc);
+ const char *friendly_name = purple_connection_get_display_name(purple_account_get_connection(log->account));
if (friendly_name != NULL) {
int friendly_name_length = strlen(friendly_name);
@@ -987,13 +987,10 @@ static char * msn_logger_read (PurpleLog
if (buddy)
their_name = purple_buddy_get_alias(buddy);
- if (log->account->alias)
- {
- alias = log->account->alias;
+ alias = purple_account_get_alias(log->account);
+ if (alias) {
alias_length = strlen(alias);
- }
- else
- {
+ } else {
alias = "";
alias_length = 0;
}
@@ -1115,10 +1112,10 @@ static char * msn_logger_read (PurpleLog
text = g_string_append(text, "<b>");
if (name_guessed == NAME_GUESS_ME) {
- if (log->account->alias)
- text = g_string_append(text, log->account->alias);
+ if (purple_account_get_alias(log->account))
+ text = g_string_append(text, purple_account_get_alias(log->account));
else
- text = g_string_append(text, log->account->username);
+ text = g_string_append(text, purple_account_get_username(log->account));
}
else if (name_guessed == NAME_GUESS_THEM)
text = g_string_append(text, their_name);
@@ -1781,7 +1778,7 @@ static GList *qip_logger_list(PurpleLogT
g_return_val_if_fail(account != NULL, NULL);
/* QIP only supports ICQ. */
- if (strcmp(account->protocol_id, "prpl-icq"))
+ if (strcmp(purple_account_get_protocol_id(account), "prpl-icq"))
return NULL;
logdir = purple_prefs_get_string("/plugins/core/log_reader/qip/log_directory");
@@ -1798,7 +1795,7 @@ static GList *qip_logger_list(PurpleLogT
if (!prpl_info->list_icon)
return NULL;
- username = g_strdup(purple_normalize(account, account->username));
+ username = g_strdup(purple_normalize(account, purple_account_get_username(account)));
filename = g_strdup_printf("%s.txt", purple_normalize(account, sn));
path = g_build_filename(logdir, username, "History", filename, NULL);
g_free(username);
@@ -2241,10 +2238,10 @@ static GList *amsn_logger_list(PurpleLog
return NULL;
/* aMSN only works with MSN/WLM */
- if (strcmp(account->protocol_id, "prpl-msn"))
+ if (strcmp(purple_account_get_protocol_id(account), "prpl-msn"))
return NULL;
- username = g_strdup(purple_normalize(account, account->username));
+ username = g_strdup(purple_normalize(account, purple_account_get_username(account)));
buddy_log = g_strdup_printf("%s.log", purple_normalize(account, sn));
log_path = g_build_filename(logdir, username, "logs", NULL);
============================================================
--- libpurple/protocols/bonjour/jabber.c 32bccc4ccc1b1d62971ce596dad35325bde4f513
+++ libpurple/protocols/bonjour/jabber.c bcfcd3ad026dbc0097dcceae84f565ff341cd4bb
@@ -929,7 +929,8 @@ bonjour_jabber_conv_match_by_name(Bonjou
while(tmp) {
ip = tmp->data;
if (ip != NULL && g_ascii_strcasecmp(ip, bconv->ip) == 0) {
- BonjourJabber *jdata = ((BonjourData*) bconv->account->gc->proto_data)->jabber_data;
+ PurpleConnection *pc = purple_account_get_connection(bconv->account);
+ BonjourJabber *jdata = ((BonjourData *)pc->proto_data)->jabber_data;
purple_debug_info("bonjour", "Matched buddy %s to incoming conversation \"from\" attrib and IP (%s)\n",
purple_buddy_get_name(pb), bconv->ip);
@@ -962,7 +963,8 @@ bonjour_jabber_conv_match_by_ip(BonjourJ
void
bonjour_jabber_conv_match_by_ip(BonjourJabberConversation *bconv) {
- BonjourJabber *jdata = ((BonjourData*) bconv->account->gc->proto_data)->jabber_data;
+ PurpleConnection *pc = purple_account_get_connection(bconv->account);
+ BonjourJabber *jdata = ((BonjourData *)pc->proto_data)->jabber_data;
struct _match_buddies_by_address_t *mbba;
GSList *buddies;
@@ -1122,7 +1124,8 @@ async_bonjour_jabber_close_conversation(
void
async_bonjour_jabber_close_conversation(BonjourJabberConversation *bconv) {
- BonjourJabber *jdata = ((BonjourData*) bconv->account->gc->proto_data)->jabber_data;
+ PurpleConnection *pc = purple_account_get_connection(bconv->account);
+ BonjourJabber *jdata = ((BonjourData *)pc->proto_data)->jabber_data;
jdata->pending_conversations = g_slist_remove(jdata->pending_conversations, bconv);
@@ -1142,8 +1145,9 @@ bonjour_jabber_close_conversation(Bonjou
if (bconv != NULL) {
BonjourData *bd = NULL;
- if(PURPLE_CONNECTION_IS_VALID(bconv->account->gc)) {
- bd = bconv->account->gc->proto_data;
+ PurpleConnection *pc = purple_account_get_connection(bconv->account);
+ if (PURPLE_CONNECTION_IS_VALID(pc)) {
+ bd = pc->proto_data;
bd->jabber_data->pending_conversations = g_slist_remove(bd->jabber_data->pending_conversations, bconv);
}
@@ -1215,7 +1219,7 @@ bonjour_jabber_stop(BonjourJabber *jdata
purple_input_remove(jdata->watcher_id6);
/* Close all the conversation sockets and remove all the watchers after sending end streams */
- if (jdata->account->gc != NULL) {
+ if (!purple_account_is_disconnected(jdata->account)) {
GSList *buddies, *l;
buddies = purple_find_buddies(jdata->account, NULL);
More information about the Commits
mailing list