pidgin: 8540c88e: Convert libpurple and protocol prpl's to...
andrew.victor at mxit.com
andrew.victor at mxit.com
Sat Oct 1 18:31:31 EDT 2011
----------------------------------------------------------------------
Revision: 8540c88ef7d1366f37d8406f5088b3d0e425d944
Parent: 3aea3aa828153db0eda55a40755f4a579f0f4e2b
Author: andrew.victor at mxit.com
Date: 10/01/11 14:21:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8540c88ef7d1366f37d8406f5088b3d0e425d944
Changelog:
Convert libpurple and protocol prpl's to use the purple_account_* accessor functions.
Changes against parent 3aea3aa828153db0eda55a40755f4a579f0f4e2b
patched libpurple/blist.c
patched libpurple/connection.c
patched libpurple/conversation.c
patched libpurple/dbus-useful.c
patched libpurple/example/nullclient.c
patched libpurple/log.c
patched libpurple/pounce.c
patched libpurple/privacy.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/cipher.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/protocol.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/null/nullprpl.c
patched libpurple/protocols/oscar/family_feedbag.c
patched libpurple/protocols/oscar/family_icbm.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/silc/silc.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/savedstatuses.c
-------------- next part --------------
============================================================
--- libpurple/conversation.c 0369509671c3181e2ca1be743b731b766e3f98b2
+++ libpurple/conversation.c 96f150214dbf8261c2bbccc2b0857eae0dfca25d
@@ -372,7 +372,7 @@ add_message_to_history(PurpleConversatio
if (gc)
me = purple_connection_get_display_name(gc);
if (!me)
- me = conv->account->username;
+ me = purple_account_get_username(conv->account);
who = me;
}
@@ -1100,7 +1100,7 @@ purple_conversation_write(PurpleConversa
purple_account_get_username(account));
if (purple_account_get_alias(account) != NULL)
- alias = account->alias;
+ alias = purple_account_get_alias(account);
else if (b != NULL && !purple_strequal(purple_buddy_get_name(b), purple_buddy_get_contact_alias(b)))
alias = purple_buddy_get_contact_alias(b);
else if (purple_connection_get_display_name(gc) != NULL)
============================================================
--- libpurple/protocols/jabber/jabber.c 641bbe3a36f8780f602c0087bf27a6e550ce4c19
+++ libpurple/protocols/jabber/jabber.c f5620e7536bc1de28a5692c34f3c353614397754
@@ -1872,8 +1872,7 @@ static void jabber_blocklist_parse(Jabbe
return;
/* This is the only privacy method supported by XEP-0191 */
- if (account->perm_deny != PURPLE_PRIVACY_DENY_USERS)
- account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
+ purple_account_set_privacy_type(account, PURPLE_PRIVACY_DENY_USERS);
/*
* TODO: When account->deny is something more than a hash table, this can
============================================================
--- libpurple/protocols/msn/msn.c 4c8d260f63db8db2759923d0506973c0ad9ea30c
+++ libpurple/protocols/msn/msn.c 0fc217c75b6336d9536eead7c6b329f6b7c0d319
@@ -813,8 +813,8 @@ msn_send_privacy(PurpleConnection *gc)
session = purple_connection_get_protocol_data(gc);
cmdproc = session->notification->cmdproc;
- if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
- account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
+ if (purple_account_get_privacy_type(account) == PURPLE_PRIVACY_ALLOW_ALL ||
+ purple_account_get_privacy_type(account) == PURPLE_PRIVACY_DENY_USERS)
trans = msn_transaction_new(cmdproc, "BLP", "%s", "AL");
else
trans = msn_transaction_new(cmdproc, "BLP", "%s", "BL");
@@ -1643,7 +1643,7 @@ msn_send_im(PurpleConnection *gc, const
purple_debug_info("msn", "prepare to send offline Message\n");
- friendname = msn_encode_mime(account->username);
+ friendname = msn_encode_mime(purple_account_get_username(account));
msn_oim_prep_send_msg_info(session->oim,
purple_account_get_username(account),
friendname, who, msgtext);
============================================================
--- libpurple/protocols/oscar/oscar.c 3f2fab04242cfe6c7ac885dd82ca7fd74a3dc641
+++ libpurple/protocols/oscar/oscar.c 6dc8669d0926ebcb40d5f94231b0f2d7ccb12121
@@ -2816,7 +2816,7 @@ static int purple_parse_locaterights(Osc
od->rights.maxsiglen = od->rights.maxawaymsglen = (guint)maxsiglen;
aim_locate_setcaps(od, purple_caps);
- oscar_set_info_and_status(account, TRUE, account->user_info, TRUE,
+ oscar_set_info_and_status(account, TRUE, purple_account_get_user_info(account), TRUE,
purple_account_get_active_status(account));
return 1;
@@ -4108,11 +4108,11 @@ static int purple_ssi_parselist(OscarDat
*/
if (!od->icq && curitem->data) {
guint8 perm_deny = aim_ssi_getpermdeny(&od->ssi.local);
- if (perm_deny != 0 && perm_deny != account->perm_deny)
+ if (perm_deny != 0 && perm_deny != purple_account_get_privacy_type(account))
{
purple_debug_info("oscar",
- "ssi: changing permdeny from %d to %hhu\n", account->perm_deny, perm_deny);
- account->perm_deny = perm_deny;
+ "ssi: changing permdeny from %d to %hhu\n", purple_account_get_privacy_type(account), perm_deny);
+ purple_account_set_privacy_type(account, perm_deny);
}
}
} break;
@@ -4741,7 +4741,7 @@ void oscar_set_aim_permdeny(PurpleConnec
* values of libpurple's PurplePrivacyType and the values used
* by the oscar protocol.
*/
- aim_ssi_setpermdeny(od, account->perm_deny);
+ aim_ssi_setpermdeny(od, purple_account_get_privacy_type(account));
}
void oscar_add_permit(PurpleConnection *gc, const char *who) {
============================================================
--- libpurple/protocols/yahoo/libymsg.c fec5c927e226c414663ae3202fae64f799f8f5ea
+++ libpurple/protocols/yahoo/libymsg.c bd9527e1554a3816d566f4ef5c704dc4f082a3f9
@@ -573,7 +573,7 @@ static void yahoo_process_list_15(Purple
yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_DO_NOT_CONNECT);
} else {
/* This buddy is on the ignore list (and therefore in no group) */
- purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",account->username, norm_bud);
+ purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n", purple_account_get_username(account), norm_bud);
purple_privacy_deny_add(account, norm_bud, 1);
}
@@ -748,13 +748,13 @@ static void yahoo_process_list(PurpleCon
}
if (got_serv_list &&
- ((account->perm_deny != PURPLE_PRIVACY_ALLOW_BUDDYLIST) &&
- (account->perm_deny != PURPLE_PRIVACY_DENY_ALL) &&
- (account->perm_deny != PURPLE_PRIVACY_ALLOW_USERS)))
+ ((purple_account_get_privacy_type(account) != PURPLE_PRIVACY_ALLOW_BUDDYLIST) &&
+ (purple_account_get_privacy_type(account) != PURPLE_PRIVACY_DENY_ALL) &&
+ (purple_account_get_privacy_type(account) != PURPLE_PRIVACY_ALLOW_USERS)))
{
- account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
+ purple_account_set_privacy_type(account, PURPLE_PRIVACY_DENY_USERS);
purple_debug_info("yahoo", "%s privacy defaulting to PURPLE_PRIVACY_DENY_USERS.\n",
- account->username);
+ purple_account_get_username(account));
}
if (yd->tmp_serv_plist) {
@@ -763,7 +763,7 @@ static void yahoo_process_list(PurpleCon
f = yahoo_friend_find(gc, *bud);
if (f) {
purple_debug_info("yahoo", "%s setting presence for %s to PERM_OFFLINE\n",
- account->username, *bud);
+ purple_account_get_username(account), *bud);
f->presence = YAHOO_PRESENCE_PERM_OFFLINE;
}
}
@@ -4476,7 +4476,7 @@ static void yahoo_get_sms_carrier(Purple
YAHOO_CLIENT_VERSION, yd->cookie_t, yd->cookie_y, strlen(validate_request_str), validate_request_str);
/* use whole URL if using HTTP Proxy */
- if ((gc->account->proxy_info) && (purple_proxy_info_get_type(gc->account->proxy_info) == PURPLE_PROXY_HTTP))
+ if ((purple_account_get_proxy_info(gc->account)) && (purple_proxy_info_get_type(purple_account_get_proxy_info(gc->account)) == PURPLE_PROXY_HTTP))
use_whole_url = TRUE;
url_data = purple_util_fetch_url_request(
@@ -5117,7 +5117,7 @@ void yahoo_set_permit_deny(PurpleConnect
account = purple_connection_get_account(gc);
- switch (account->perm_deny)
+ switch (purple_account_get_privacy_type(account))
{
case PURPLE_PRIVACY_ALLOW_ALL:
for (deny = account->deny; deny; deny = deny->next)
============================================================
--- libpurple/log.c 0c3f25c46b130043aaa4f84bfcc5adf8156e6b2e
+++ libpurple/log.c a057ec1242e6d2db2d339caa7fa716b412df62aa
@@ -1103,7 +1103,7 @@ static void log_get_log_sets_common(GHas
/* Find the account for username in the list of accounts for protocol. */
username_unescaped = purple_unescape_filename(username);
for (account_iter = g_list_first(accounts) ; account_iter != NULL ; account_iter = account_iter->next) {
- if (purple_strequal(((PurpleAccount *)account_iter->data)->username, username_unescaped)) {
+ if (purple_strequal(purple_account_get_username((PurpleAccount *)account_iter->data), username_unescaped)) {
account = account_iter->data;
break;
}
============================================================
--- libpurple/pounce.c 180f62a0b509cdc516fd2299a9cdbe32d74bc368
+++ libpurple/pounce.c 70282f327d214954bd34bdfc6203a27b51aabe2e
@@ -205,7 +205,7 @@ pounce_to_xmlnode(PurplePounce *pounce)
xmlnode_set_attrib(node, "ui", pounce->ui_type);
child = xmlnode_new_child(node, "account");
- xmlnode_set_attrib(child, "protocol", pouncer->protocol_id);
+ xmlnode_set_attrib(child, "protocol", purple_account_get_protocol_id(pouncer));
xmlnode_insert_data(child,
purple_normalize(pouncer, purple_account_get_username(pouncer)), -1);
============================================================
--- libpurple/blist.c d08f5f13c2e25d7c70ec5e4f804df3850b6c49f1
+++ libpurple/blist.c 15122c5352a467c02184a7ff116f41be9ac0417b
@@ -314,7 +314,7 @@ accountprivacy_to_xmlnode(PurpleAccount
node = xmlnode_new("account");
xmlnode_set_attrib(node, "proto", purple_account_get_protocol_id(account));
xmlnode_set_attrib(node, "name", purple_account_get_username(account));
- g_snprintf(buf, sizeof(buf), "%d", account->perm_deny);
+ g_snprintf(buf, sizeof(buf), "%d", purple_account_get_privacy_type(account));
xmlnode_set_attrib(node, "mode", buf);
for (cur = account->permit; cur; cur = cur->next)
@@ -641,7 +641,7 @@ purple_blist_load()
continue;
imode = atoi(mode);
- account->perm_deny = (imode != 0 ? imode : PURPLE_PRIVACY_ALLOW_ALL);
+ purple_account_set_privacy_type(account, (imode != 0 ? imode : PURPLE_PRIVACY_ALLOW_ALL));
for (x = anode->child; x; x = x->next) {
char *name;
============================================================
--- libpurple/connection.c ac517e60b2f8e692cba94c9de2550444386f7f2f
+++ libpurple/connection.c 81ac93c4bf3524634bf1ddc8e64bc30568a1ec3f
@@ -440,7 +440,7 @@ purple_connection_get_password(const Pur
{
g_return_val_if_fail(gc != NULL, NULL);
- return gc->password ? gc->password : gc->account->password;
+ return gc->password ? gc->password : purple_account_get_password(gc->account);
}
const char *
============================================================
--- libpurple/privacy.c d0ea5addf9ad746869966e8b5334c7e3faa54f4b
+++ libpurple/privacy.c ceb4aafd864c871a4fd4dd14ea0d3c0d9fa006fd
@@ -264,9 +264,9 @@ purple_privacy_allow(PurpleAccount *acco
gboolean restore)
{
GSList *list;
- PurplePrivacyType type = account->perm_deny;
+ PurplePrivacyType type = purple_account_get_privacy_type(account);
- switch (account->perm_deny) {
+ switch (type) {
case PURPLE_PRIVACY_ALLOW_ALL:
return;
case PURPLE_PRIVACY_ALLOW_USERS:
@@ -287,13 +287,13 @@ purple_privacy_allow(PurpleAccount *acco
}
}
purple_privacy_permit_add(account, who, local);
- account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
+ purple_account_set_privacy_type(account, PURPLE_PRIVACY_ALLOW_USERS);
break;
case PURPLE_PRIVACY_ALLOW_BUDDYLIST:
if (!purple_find_buddy(account, who)) {
add_all_buddies_to_permit_list(account, local);
purple_privacy_permit_add(account, who, local);
- account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
+ purple_account_set_privacy_type(account, PURPLE_PRIVACY_ALLOW_USERS);
}
break;
default:
@@ -301,7 +301,7 @@ purple_privacy_allow(PurpleAccount *acco
}
/* Notify the server if the privacy setting was changed */
- if (type != account->perm_deny && purple_account_is_connected(account))
+ if (type != purple_account_get_privacy_type(account) && purple_account_is_connected(account))
serv_set_permit_deny(purple_account_get_connection(account));
}
@@ -316,9 +316,9 @@ purple_privacy_deny(PurpleAccount *accou
gboolean restore)
{
GSList *list;
- PurplePrivacyType type = account->perm_deny;
+ PurplePrivacyType type = purple_account_get_privacy_type(account);
- switch (account->perm_deny) {
+ switch (type) {
case PURPLE_PRIVACY_ALLOW_ALL:
if (!restore) {
/* Empty the deny-list. */
@@ -331,7 +331,7 @@ purple_privacy_deny(PurpleAccount *accou
}
}
purple_privacy_deny_add(account, who, local);
- account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
+ purple_account_set_privacy_type(account, PURPLE_PRIVACY_DENY_USERS);
break;
case PURPLE_PRIVACY_ALLOW_USERS:
purple_privacy_permit_remove(account, who, local);
@@ -345,7 +345,7 @@ purple_privacy_deny(PurpleAccount *accou
if (purple_find_buddy(account, who)) {
add_all_buddies_to_permit_list(account, local);
purple_privacy_permit_remove(account, who, local);
- account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
+ purple_account_set_privacy_type(account, PURPLE_PRIVACY_ALLOW_USERS);
}
break;
default:
@@ -353,7 +353,7 @@ purple_privacy_deny(PurpleAccount *accou
}
/* Notify the server if the privacy setting was changed */
- if (type != account->perm_deny && purple_account_is_connected(account))
+ if (type != purple_account_get_privacy_type(account) && purple_account_is_connected(account))
serv_set_permit_deny(purple_account_get_connection(account));
}
@@ -362,7 +362,7 @@ purple_privacy_check(PurpleAccount *acco
{
GSList *list;
- switch (account->perm_deny) {
+ switch (purple_account_get_privacy_type(account)) {
case PURPLE_PRIVACY_ALLOW_ALL:
return TRUE;
============================================================
--- libpurple/protocols/novell/novell.c d3edd8dc8b43dd2f85553cfa2d3b37fc12dd4ea7
+++ libpurple/protocols/novell/novell.c d097789b4e526ebaedd1f5a09838145baa483c19
@@ -1404,15 +1404,15 @@ _sync_privacy_lists(NMUser *user)
/* Set the Purple privacy setting */
if (user->default_deny) {
if (user->allow_list == NULL) {
- gc->account->perm_deny = PURPLE_PRIVACY_DENY_ALL;
+ purple_account_set_privacy_type(gc->account, PURPLE_PRIVACY_DENY_ALL);
} else {
- gc->account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
+ purple_account_set_privacy_type(gc->account, PURPLE_PRIVACY_ALLOW_USERS);
}
} else {
if (user->deny_list == NULL) {
- gc->account->perm_deny = PURPLE_PRIVACY_ALLOW_ALL;
+ purple_account_set_privacy_type(gc->account, PURPLE_PRIVACY_ALLOW_ALL);
} else {
- gc->account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
+ purple_account_set_privacy_type(gc->account, PURPLE_PRIVACY_DENY_USERS);
}
}
@@ -3253,7 +3253,7 @@ novell_set_permit_deny(PurpleConnection
return;
}
- switch (gc->account->perm_deny) {
+ switch (purple_account_get_privacy_type(gc->account)) {
case PURPLE_PRIVACY_ALLOW_ALL:
rc = nm_send_set_privacy_default(user, FALSE,
============================================================
--- libpurple/protocols/silc/silc.c cec8a40b3c80dfe7cb2a82d4ca52cb5727ecc701
+++ libpurple/protocols/silc/silc.c 02dd9bb10e84e6399df513dd8fe0296f7c238403
@@ -1593,7 +1593,7 @@ static PurpleCmdRet silcpurple_cmd_chat_
g_free(tmp2);
} else
buf = g_strdup(_("No topic is set"));
- purple_conv_chat_write(PURPLE_CONV_CHAT(conv), gc->account->username, buf,
+ purple_conv_chat_write(PURPLE_CONV_CHAT(conv), purple_account_get_username(gc->account), buf,
PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NO_LOG, time(NULL));
g_free(buf);
============================================================
--- libpurple/savedstatuses.c 115d99392e191c50bac181448aa5ddf5ff0513ea
+++ libpurple/savedstatuses.c 5ea5e47856b232da944af4f8af188d65ba6a81a3
@@ -403,7 +403,7 @@ parse_substatus(xmlnode *substatus)
if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL))
{
ret->type = purple_status_type_find_with_id(
- ret->account->status_types, data);
+ purple_account_get_status_types(ret->account), data);
g_free(data);
}
============================================================
--- libpurple/protocols/sametime/sametime.c f973b6ae1f2b826fd8ea47ad25d0f198ecc75f56
+++ libpurple/protocols/sametime/sametime.c efac173afe1bfc9c55dc0a6ba83b2119edbf4b29
@@ -4672,7 +4672,7 @@ static void mw_prpl_set_permit_deny(Purp
session = pd->session;
g_return_if_fail(session != NULL);
- switch(acct->perm_deny) {
+ switch(purple_account_get_privacy_type(acct)) {
case PURPLE_PRIVACY_DENY_USERS:
DEBUG_INFO("PURPLE_PRIVACY_DENY_USERS\n");
privacy_fill(&privacy, acct->deny);
@@ -4696,7 +4696,7 @@ static void mw_prpl_set_permit_deny(Purp
break;
default:
- DEBUG_INFO("acct->perm_deny is 0x%x\n", acct->perm_deny);
+ DEBUG_INFO("acct->perm_deny is 0x%x\n", purple_account_get_privacy_type(acct));
return;
}
============================================================
--- libpurple/dbus-useful.c 121af7c96cfa2087f961dc8ad2d8d20a3dcab904
+++ libpurple/dbus-useful.c d1f02a0b6b85605efe46457908c394e2c9c23486
@@ -25,7 +25,7 @@ purple_accounts_find_ext(const char *nam
if (who && strcmp(purple_normalize(NULL, purple_account_get_username(account)), who))
continue;
- if (protocol_id && strcmp(account->protocol_id, protocol_id))
+ if (protocol_id && strcmp(purple_account_get_protocol_id(account), protocol_id))
continue;
if (account_test && !account_test(account))
============================================================
--- libpurple/protocols/oscar/family_feedbag.c 549c9f2e23193ac28d6b4a2718ae2c0129e7821f
+++ libpurple/protocols/oscar/family_feedbag.c d264a70a053e95bdcf6e80168d3db2cd5f114ee1
@@ -661,7 +661,7 @@ static int aim_ssi_sync(OscarData *od)
for (cur1 = od->ssi.local.data; cur1; cur1 = cur1->next)
aim_ssi_item_debug_append(debugstr, "\t", cur1);
purple_debug_misc("oscar", "Dumping item list of account %s:\n%s",
- purple_connection_get_account(od->gc)->username, debugstr->str);
+ purple_account_get_username(purple_connection_get_account(od->gc)), debugstr->str);
}
}
g_string_free(debugstr, TRUE);
@@ -1284,7 +1284,7 @@ static int parsedata(OscarData *od, Flap
aim_tlvlist_free(data);
}
purple_debug_misc("oscar", "Reading items from tlvlist for account %s:\n%s",
- purple_connection_get_account(od->gc)->username, debugstr->str);
+ purple_account_get_username(purple_connection_get_account(od->gc)), debugstr->str);
g_string_free(debugstr, TRUE);
/* Read in the timestamp */
============================================================
--- libpurple/protocols/oscar/family_icbm.c 8db064a7666ce65d7c90012a8c19204c7a6ed03f
+++ libpurple/protocols/oscar/family_icbm.c d504940a4f2d85146d0e86cfc5f8443dc5a9eb81
@@ -1941,7 +1941,7 @@ int icq_im_xstatus_request(OscarData *od
account = purple_connection_get_account(od->gc);
- statxml = g_strdup_printf(fmt, account->username);
+ statxml = g_strdup_printf(fmt, purple_account_get_username(account));
xmllen = strlen(statxml);
aim_icbm_makecookie(cookie);
@@ -2035,7 +2035,7 @@ int icq_relay_xstatus(OscarData *od, con
/* if (!strcmp(account->username, sn))
icq_im_xstatus_request(od, sn); */
- status = purple_presence_get_active_status(account->presence);
+ status = purple_presence_get_active_status(purple_account_get_presence(account));
if (!status)
return -EINVAL;
@@ -2051,7 +2051,7 @@ int icq_relay_xstatus(OscarData *od, con
if (!msg)
return -EINVAL;
- statxml = g_strdup_printf(fmt, account->username, title, msg);
+ statxml = g_strdup_printf(fmt, purple_account_get_username(account), title, msg);
len = strlen(statxml);
purple_debug_misc("oscar", "X-Status AutoReply: %s, %s\n", formatted_msg, msg);
============================================================
--- libpurple/example/nullclient.c 260f65e0b862614dbd86173377ed47e750175e4d
+++ libpurple/example/nullclient.c d08cd2c45f3807e12f5404caff3ce030ef9f5c9c
@@ -237,7 +237,7 @@ signed_on(PurpleConnection *gc, gpointer
signed_on(PurpleConnection *gc, gpointer null)
{
PurpleAccount *account = purple_connection_get_account(gc);
- printf("Account connected: %s %s\n", account->username, account->protocol_id);
+ printf("Account connected: %s %s\n", purple_account_get_username(account), purple_account_get_protocol_id(account));
}
static void
============================================================
--- libpurple/protocols/myspace/myspace.c cc8306b386094c2f5ad4eb4a5668922f16ff9b8e
+++ libpurple/protocols/myspace/myspace.c 25b212e602342628070fa37da7070e5749a31a7d
@@ -254,7 +254,7 @@ msim_send_bm(MsimSession *session, const
g_return_val_if_fail(who != NULL, FALSE);
g_return_val_if_fail(text != NULL, FALSE);
- from_username = session->account->username;
+ from_username = purple_account_get_username(session->account);
g_return_val_if_fail(from_username != NULL, FALSE);
@@ -705,14 +705,14 @@ msim_login_challenge(MsimSession *sessio
purple_connection_update_progress(session->gc, _("Logging in"), 2, 4);
response_len = 0;
- response = msim_compute_login_response(nc, account->username, account->password, &response_len);
+ response = msim_compute_login_response(nc, purple_account_get_username(account), purple_account_get_password(account), &response_len);
g_free(nc);
ret = msim_send(session,
"login2", MSIM_TYPE_INTEGER, MSIM_AUTH_ALGORITHM,
/* This is actually user's email address. */
- "username", MSIM_TYPE_STRING, g_strdup(account->username),
+ "username", MSIM_TYPE_STRING, g_strdup(purple_account_get_username(account)),
/* GString will be freed in msim_msg_free() in msim_send(). */
"response", MSIM_TYPE_BINARY, g_string_new_len(response, response_len),
"clientver", MSIM_TYPE_INTEGER, MSIM_CLIENT_VERSION,
@@ -752,8 +752,8 @@ msim_unrecognized(MsimSession *session,
*/
purple_debug_info("msim", "Unrecognized data on account for %s\n",
- (session && session->account && session->account->username) ?
- session->account->username : "(NULL)");
+ (session && session->account && purple_account_get_username(session->account)) ?
+ purple_account_get_username(session->account) : "(NULL)");
if (note) {
purple_debug_info("msim", "(Note: %s)\n", note);
}
@@ -1838,7 +1838,7 @@ msim_error(MsimSession *session, MsimMes
if (!purple_account_get_remember_password(session->account))
purple_account_set_password(session->account, NULL);
#ifdef MSIM_MAX_PASSWORD_LENGTH
- if (session->account->password && (strlen(session->account->password) > MSIM_MAX_PASSWORD_LENGTH)) {
+ if (purple_account_get_password(session->account) && (strlen(purple_account_get_password(session->account)) > MSIM_MAX_PASSWORD_LENGTH)) {
gchar *suggestion;
suggestion = g_strdup_printf(_("%s Your password is "
@@ -1846,7 +1846,7 @@ msim_error(MsimSession *session, MsimMes
"maximum length of %d. Please shorten your "
"password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."),
full_errmsg,
- strlen(session->account->password),
+ strlen(purple_account_get_password(session->account)),
MSIM_MAX_PASSWORD_LENGTH);
/* Replace full_errmsg. */
@@ -2184,9 +2184,9 @@ msim_login(PurpleAccount *acct)
int port;
g_return_if_fail(acct != NULL);
- g_return_if_fail(acct->username != NULL);
+ g_return_if_fail(purple_account_get_username(acct) != NULL);
- purple_debug_info("msim", "logging in %s\n", acct->username);
+ purple_debug_info("msim", "logging in %s\n", purple_account_get_username(acct));
gc = purple_account_get_connection(acct);
purple_connection_set_protocol_data(gc, msim_session_new(acct));
============================================================
--- libpurple/protocols/null/nullprpl.c 6f72ca0c0822fedc1a45146f8f76f1a3a93a0981
+++ libpurple/protocols/null/nullprpl.c 42ae7f5ee4621e23102d5b871240efd09b152e04
@@ -113,7 +113,7 @@ static void call_if_nullprpl(gpointer da
PurpleConnection *gc = (PurpleConnection *)(data);
GcFuncData *gcfdata = (GcFuncData *)userdata;
- if (!strcmp(gc->account->protocol_id, NULLPRPL_ID))
+ if (!strcmp(purple_account_get_protocol_id(gc->account), NULLPRPL_ID))
gcfdata->fn(gcfdata->from, gc, gcfdata->userdata);
}
@@ -160,8 +160,8 @@ static void discover_status(PurpleConnec
static void discover_status(PurpleConnection *from, PurpleConnection *to,
gpointer userdata) {
- const char *from_username = from->account->username;
- const char *to_username = to->account->username;
+ const char *from_username = purple_account_get_username(from->account);
+ const char *to_username = purple_account_get_username(to->account);
if (purple_find_buddy(from->account, to_username)) {
PurpleStatus *status = purple_account_get_active_status(to->account);
@@ -186,7 +186,7 @@ static void report_status_change(PurpleC
static void report_status_change(PurpleConnection *from, PurpleConnection *to,
gpointer userdata) {
purple_debug_info("nullprpl", "notifying %s that %s changed status\n",
- to->account->username, from->account->username);
+ purple_account_get_username(to->account), purple_account_get_username(from->account));
discover_status(to, from, NULL);
}
@@ -199,7 +199,7 @@ static void nullprpl_input_user_info(Pur
PurpleConnection *gc = (PurpleConnection *)action->context;
PurpleAccount *acct = purple_connection_get_account(gc);
purple_debug_info("nullprpl", "showing 'Set User Info' dialog for %s\n",
- acct->username);
+ purple_account_get_username(acct));
purple_account_request_change_user_info(acct);
}
@@ -225,7 +225,7 @@ static char *nullprpl_status_text(Purple
static char *nullprpl_status_text(PurpleBuddy *buddy) {
purple_debug_info("nullprpl", "getting %s's status text for %s\n",
- buddy->name, buddy->account->username);
+ buddy->name, purple_account_get_username(buddy->account));
if (purple_find_buddy(buddy->account, buddy->name)) {
PurplePresence *presence = purple_buddy_get_presence(buddy);
@@ -287,7 +287,7 @@ static GList *nullprpl_status_types(Purp
PurpleStatusType *type;
purple_debug_info("nullprpl", "returning status types for %s: %s, %s, %s\n",
- acct->username,
+ purple_account_get_username(acct),
NULL_STATUS_ONLINE, NULL_STATUS_AWAY, NULL_STATUS_OFFLINE);
type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
@@ -366,7 +366,7 @@ static void nullprpl_login(PurpleAccount
PurpleConnection *gc = purple_account_get_connection(acct);
GList *offline_messages;
- purple_debug_info("nullprpl", "logging in %s\n", acct->username);
+ purple_debug_info("nullprpl", "logging in %s\n", purple_account_get_username(acct));
purple_connection_update_progress(gc, _("Connecting"),
0, /* which connection step this is */
@@ -385,12 +385,12 @@ static void nullprpl_login(PurpleAccount
/* fetch stored offline messages */
purple_debug_info("nullprpl", "checking for offline messages for %s\n",
- acct->username);
- offline_messages = g_hash_table_lookup(goffline_messages, acct->username);
+ purple_account_get_username(acct));
+ offline_messages = g_hash_table_lookup(goffline_messages, purple_account_get_username(acct));
while (offline_messages) {
GOfflineMessage *message = (GOfflineMessage *)offline_messages->data;
purple_debug_info("nullprpl", "delivering offline message to %s: %s\n",
- acct->username, message->message);
+ purple_account_get_username(acct), message->message);
serv_got_im(gc, message->from, message->message, message->flags,
message->mtime);
offline_messages = g_list_next(offline_messages);
@@ -401,7 +401,7 @@ static void nullprpl_login(PurpleAccount
}
g_list_free(offline_messages);
- g_hash_table_remove(goffline_messages, &acct->username);
+ g_hash_table_remove(goffline_messages, purple_account_get_username(acct));
}
static void nullprpl_close(PurpleConnection *gc)
@@ -413,7 +413,7 @@ static int nullprpl_send_im(PurpleConnec
static int nullprpl_send_im(PurpleConnection *gc, const char *who,
const char *message, PurpleMessageFlags flags)
{
- const char *from_username = gc->account->username;
+ const char *from_username = purple_account_get_username(gc->account);
PurpleMessageFlags receive_flags = ((flags & ~PURPLE_MESSAGE_SEND)
| PURPLE_MESSAGE_RECV);
PurpleAccount *to_acct = purple_accounts_find(who, NULLPRPL_ID);
@@ -423,7 +423,7 @@ static int nullprpl_send_im(PurpleConnec
from_username, who, message);
/* is the sender blocked by the recipient's privacy settings? */
- if (to_acct && !purple_privacy_check(to_acct, gc->account->username)) {
+ if (to_acct && !purple_privacy_check(to_acct, purple_account_get_username(gc->account))) {
char *msg = g_strdup_printf(
_("Your message was blocked by %s's privacy settings."), who);
purple_debug_info("nullprpl",
@@ -461,7 +461,7 @@ static void nullprpl_set_info(PurpleConn
static void nullprpl_set_info(PurpleConnection *gc, const char *info) {
purple_debug_info("nullprpl", "setting %s's user info to %s\n",
- gc->account->username, info);
+ purple_account_get_username(gc->account), info);
}
static const char *typing_state_to_string(PurpleTypingState typing) {
@@ -475,10 +475,10 @@ static void notify_typing(PurpleConnecti
static void notify_typing(PurpleConnection *from, PurpleConnection *to,
gpointer typing) {
- const char *from_username = from->account->username;
+ const char *from_username = purple_account_get_username(from->account);
const char *action = typing_state_to_string((PurpleTypingState)typing);
purple_debug_info("nullprpl", "notifying %s that %s %s\n",
- to->account->username, from_username, action);
+ purple_account_get_username(to->account), from_username, action);
serv_got_typing(to,
from_username,
@@ -489,7 +489,7 @@ static unsigned int nullprpl_send_typing
static unsigned int nullprpl_send_typing(PurpleConnection *gc, const char *name,
PurpleTypingState typing) {
- purple_debug_info("nullprpl", "%s %s\n", gc->account->username,
+ purple_debug_info("nullprpl", "%s %s\n", purple_account_get_username(gc->account),
typing_state_to_string(typing));
foreach_nullprpl_gc(notify_typing, gc, (gpointer)typing);
return 0;
@@ -501,7 +501,7 @@ static void nullprpl_get_info(PurpleConn
PurpleAccount *acct;
purple_debug_info("nullprpl", "Fetching %s's user info for %s\n", username,
- gc->account->username);
+ purple_account_get_username(gc->account));
if (!get_nullprpl_gc(username)) {
char *msg = g_strdup_printf(_("%s is not logged in."), username);
@@ -529,28 +529,28 @@ static void nullprpl_set_status(PurpleAc
static void nullprpl_set_status(PurpleAccount *acct, PurpleStatus *status) {
const char *msg = purple_status_get_attr_string(status, "message");
purple_debug_info("nullprpl", "setting %s's status to %s: %s\n",
- acct->username, purple_status_get_name(status), msg);
+ purple_account_get_username(acct), purple_status_get_name(status), msg);
- foreach_nullprpl_gc(report_status_change, get_nullprpl_gc(acct->username),
+ foreach_nullprpl_gc(report_status_change, get_nullprpl_gc(purple_account_get_username(acct)),
NULL);
}
static void nullprpl_set_idle(PurpleConnection *gc, int idletime) {
purple_debug_info("nullprpl",
"purple reports that %s has been idle for %d seconds\n",
- gc->account->username, idletime);
+ purple_account_get_username(gc->account), idletime);
}
static void nullprpl_change_passwd(PurpleConnection *gc, const char *old_pass,
const char *new_pass) {
purple_debug_info("nullprpl", "%s wants to change their password\n",
- gc->account->username);
+ purple_account_get_username(gc->account));
}
static void nullprpl_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
PurpleGroup *group, const char *message)
{
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
PurpleConnection *buddy_gc = get_nullprpl_gc(buddy->name);
purple_debug_info("nullprpl", "adding %s to %s's buddy list\n", buddy->name,
@@ -594,7 +594,7 @@ static void nullprpl_remove_buddy(Purple
PurpleGroup *group)
{
purple_debug_info("nullprpl", "removing %s from %s's buddy list\n",
- buddy->name, gc->account->username);
+ buddy->name, purple_account_get_username(gc->account));
}
static void nullprpl_remove_buddies(PurpleConnection *gc, GList *buddies,
@@ -620,22 +620,22 @@ static void nullprpl_add_permit(PurpleCo
*/
static void nullprpl_add_permit(PurpleConnection *gc, const char *name) {
purple_debug_info("nullprpl", "%s adds %s to their allowed list\n",
- gc->account->username, name);
+ purple_account_get_username(gc->account), name);
}
static void nullprpl_add_deny(PurpleConnection *gc, const char *name) {
purple_debug_info("nullprpl", "%s adds %s to their blocked list\n",
- gc->account->username, name);
+ purple_account_get_username(gc->account), name);
}
static void nullprpl_rem_permit(PurpleConnection *gc, const char *name) {
purple_debug_info("nullprpl", "%s removes %s from their allowed list\n",
- gc->account->username, name);
+ purple_account_get_username(gc->account), name);
}
static void nullprpl_rem_deny(PurpleConnection *gc, const char *name) {
purple_debug_info("nullprpl", "%s removes %s from their blocked list\n",
- gc->account->username, name);
+ purple_account_get_username(gc->account), name);
}
static void nullprpl_set_permit_deny(PurpleConnection *gc) {
@@ -668,7 +668,7 @@ static void nullprpl_join_chat(PurpleCon
}
static void nullprpl_join_chat(PurpleConnection *gc, GHashTable *components) {
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
const char *room = g_hash_table_lookup(components, "room");
int chat_id = g_str_hash(room);
purple_debug_info("nullprpl", "%s is joining chat room %s\n", username, room);
@@ -692,7 +692,7 @@ static void nullprpl_reject_chat(PurpleC
static void nullprpl_reject_chat(PurpleConnection *gc, GHashTable *components) {
const char *invited_by = g_hash_table_lookup(components, "invited_by");
const char *room = g_hash_table_lookup(components, "room");
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
PurpleConnection *invited_by_gc = get_nullprpl_gc(invited_by);
char *message = g_strdup_printf(
"%s %s %s.",
@@ -719,7 +719,7 @@ static void nullprpl_chat_invite(PurpleC
static void nullprpl_chat_invite(PurpleConnection *gc, int id,
const char *message, const char *who) {
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
PurpleConversation *conv = purple_find_chat(gc, id);
const char *room = purple_conversation_get_name(conv);
PurpleAccount *to_acct = purple_accounts_find(who, NULLPRPL_ID);
@@ -762,7 +762,7 @@ static void nullprpl_chat_leave(PurpleCo
static void nullprpl_chat_leave(PurpleConnection *gc, int id) {
PurpleConversation *conv = purple_find_chat(gc, id);
purple_debug_info("nullprpl", "%s is leaving chat room %s\n",
- gc->account->username, purple_conversation_get_name(conv));
+ purple_account_get_username(gc->account), purple_conversation_get_name(conv));
/* tell everyone that we left */
foreach_gc_in_chat(left_chat_room, gc, id, NULL);
@@ -789,7 +789,7 @@ static PurpleCmdRet send_whisper(PurpleC
return PURPLE_CMD_RET_FAILED;
}
- from_username = purple_conversation_get_account(conv)->username;
+ from_username = purple_account_get_username(purple_conversation_get_account(conv));
purple_debug_info("nullprpl", "%s whispers to %s in chat room %s: %s\n",
from_username, to_username, purple_conversation_get_name(conv), message);
@@ -821,7 +821,7 @@ static void nullprpl_chat_whisper(Purple
static void nullprpl_chat_whisper(PurpleConnection *gc, int id, const char *who,
const char *message) {
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
PurpleConversation *conv = purple_find_chat(gc, id);
purple_debug_info("nullprpl",
"%s receives whisper from %s in chat room %s: %s\n",
@@ -846,7 +846,7 @@ static int nullprpl_chat_send(PurpleConn
static int nullprpl_chat_send(PurpleConnection *gc, int id, const char *message,
PurpleMessageFlags flags) {
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
PurpleConversation *conv = purple_find_chat(gc, id);
if (conv) {
@@ -868,14 +868,14 @@ static void nullprpl_register_user(Purpl
static void nullprpl_register_user(PurpleAccount *acct) {
purple_debug_info("nullprpl", "registering account for %s\n",
- acct->username);
+ purple_account_get_username(acct));
}
static void nullprpl_get_cb_info(PurpleConnection *gc, int id, const char *who) {
PurpleConversation *conv = purple_find_chat(gc, id);
purple_debug_info("nullprpl",
"retrieving %s's info for %s in chat room %s\n", who,
- gc->account->username, purple_conversation_get_name(conv));
+ purple_account_get_username(gc->account), purple_conversation_get_name(conv));
nullprpl_get_info(gc, who);
}
@@ -883,25 +883,25 @@ static void nullprpl_alias_buddy(PurpleC
static void nullprpl_alias_buddy(PurpleConnection *gc, const char *who,
const char *alias) {
purple_debug_info("nullprpl", "%s sets %s's alias to %s\n",
- gc->account->username, who, alias);
+ purple_account_get_username(gc->account), who, alias);
}
static void nullprpl_group_buddy(PurpleConnection *gc, const char *who,
const char *old_group,
const char *new_group) {
purple_debug_info("nullprpl", "%s has moved %s from group %s to group %s\n",
- gc->account->username, who, old_group, new_group);
+ purple_account_get_username(gc->account), who, old_group, new_group);
}
static void nullprpl_rename_group(PurpleConnection *gc, const char *old_name,
PurpleGroup *group, GList *moved_buddies) {
purple_debug_info("nullprpl", "%s has renamed group %s to %s\n",
- gc->account->username, old_name, group->name);
+ purple_account_get_username(gc->account), old_name, group->name);
}
static void nullprpl_convo_closed(PurpleConnection *gc, const char *who) {
purple_debug_info("nullprpl", "%s's conversation with %s was closed\n",
- gc->account->username, who);
+ purple_account_get_username(gc->account), who);
}
/* normalize a username (e.g. remove whitespace, add default domain, etc.)
@@ -915,20 +915,20 @@ static void nullprpl_set_buddy_icon(Purp
static void nullprpl_set_buddy_icon(PurpleConnection *gc,
PurpleStoredImage *img) {
purple_debug_info("nullprpl", "setting %s's buddy icon to %s\n",
- gc->account->username,
+ purple_account_get_username(gc->account),
img ? purple_imgstore_get_filename(img) : "(null)");
}
static void nullprpl_remove_group(PurpleConnection *gc, PurpleGroup *group) {
purple_debug_info("nullprpl", "%s has removed group %s\n",
- gc->account->username, group->name);
+ purple_account_get_username(gc->account), group->name);
}
static void set_chat_topic_fn(PurpleConvChat *from, PurpleConvChat *to,
int id, const char *room, gpointer userdata) {
const char *topic = (const char *)userdata;
- const char *username = purple_conversation_get_account(purple_conv_chat_get_conversation(from))->username;
+ const char *username = purple_account_get_username(purple_conversation_get_account(purple_conv_chat_get_conversation(from)));
char *msg;
purple_conv_chat_set_topic(to, username, topic);
@@ -954,7 +954,7 @@ static void nullprpl_set_chat_topic(Purp
return;
purple_debug_info("nullprpl", "%s sets topic of chat room '%s' to '%s'\n",
- gc->account->username, purple_conversation_get_name(conv), topic);
+ purple_account_get_username(gc->account), purple_conversation_get_name(conv), topic);
last_topic = purple_conv_chat_get_topic(chat);
if ((!topic && !last_topic) ||
@@ -970,7 +970,7 @@ static PurpleRoomlist *nullprpl_roomlist
}
static PurpleRoomlist *nullprpl_roomlist_get_list(PurpleConnection *gc) {
- const char *username = gc->account->username;
+ const char *username = purple_account_get_username(gc->account);
PurpleRoomlist *roomlist = purple_roomlist_new(gc->account);
GList *fields = NULL;
PurpleRoomlistField *field;
============================================================
--- libpurple/protocols/mxit/actions.c d890a80f2e317c541954666154e7c4b6d04041ed
+++ libpurple/protocols/mxit/actions.c 322aa1361f77118a4b0b0cc41bddb58ef28df0b2
@@ -372,12 +372,12 @@ static void mxit_change_pin_action( Purp
purple_request_fields_add_group( fields, group );
/* pin */
- field = purple_request_field_string_new( "pin", _( "PIN" ), session->acc->password, FALSE );
+ field = purple_request_field_string_new( "pin", _( "PIN" ), purple_account_get_password( session->acc ), FALSE );
purple_request_field_string_set_masked( field, TRUE );
purple_request_field_group_add_field( group, field );
/* verify pin */
- field = purple_request_field_string_new( "pin2", _( "Verify PIN" ), session->acc->password, FALSE );
+ field = purple_request_field_string_new( "pin2", _( "Verify PIN" ), purple_account_get_password( session->acc ), FALSE );
purple_request_field_string_set_masked( field, TRUE );
purple_request_field_group_add_field( group, field );
============================================================
--- libpurple/protocols/mxit/cipher.c 9ed2c64fec02de40e478cd601cda4e322fc7dff6
+++ libpurple/protocols/mxit/cipher.c df932e8124c5aeaaaf83e71dafae57ac80df691e
@@ -79,7 +79,8 @@ static char* transport_layer_key( struct
static char* transport_layer_key( struct MXitSession* session )
{
static char key[16 + 1];
- int passlen = strlen( session->acc->password );
+ const char* password = purple_account_get_password( session->acc );
+ int passlen = strlen( password );
/* initialize with initial key */
g_strlcpy( key, INITIAL_KEY, sizeof( key ) );
@@ -89,9 +90,9 @@ static char* transport_layer_key( struct
/* add last 8 characters of the PIN (no padding if less characters) */
if ( passlen <= 8 )
- memcpy( key + 8, session->acc->password, passlen );
+ memcpy( key + 8, password, passlen );
else
- memcpy( key + 8, session->acc->password + ( passlen - 8 ), 8 );
+ memcpy( key + 8, password + ( passlen - 8 ), 8 );
return key;
}
@@ -124,7 +125,7 @@ char* mxit_encrypt_password( struct MXit
/* build the secret data to be encrypted: SECRET_HEADER + password */
pass = g_string_new( SECRET_HEADER );
- g_string_append( pass, session->acc->password );
+ g_string_append( pass, purple_account_get_password( session->acc) );
padding_add( pass ); /* add ISO10126 padding */
/* now encrypt the secret. we encrypt each block separately (ECB mode) */
============================================================
--- libpurple/protocols/mxit/login.c 61047478f2053cfd3dae6ede35c725d8b89e5813
+++ libpurple/protocols/mxit/login.c f80af7e4d3e842e62fff3aebdabc6719855c5c06
@@ -546,9 +546,22 @@ static void mxit_cb_captcha_ok( PurpleCo
state = purple_account_get_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN );
url = g_strdup_printf( "%s?type=getpid&sessionid=%s&login=%s&ver=%i.%i.%i&clientid=%s&cat=%s&chalresp=%s&cc=%s&loc=%s&path=%i&brand=%s&model=%s&h=%i&w=%i&ts=%li",
- session->logindata->wapserver, session->logindata->sessionid, purple_url_encode( session->acc->username ), PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, MXIT_CLIENT_ID, MXIT_CP_ARCH,
- captcha_resp, session->logindata->cc, session->logindata->locale, ( state == MXIT_STATE_REGISTER1 ) ? 0 : 1, MXIT_CP_PLATFORM, MXIT_CP_OS,
- MXIT_CAPTCHA_HEIGHT, MXIT_CAPTCHA_WIDTH, time( NULL ) );
+ session->logindata->wapserver,
+ session->logindata->sessionid,
+ purple_url_encode( purple_account_get_username( session->acc ) ),
+ PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION,
+ MXIT_CLIENT_ID,
+ MXIT_CP_ARCH,
+ captcha_resp,
+ session->logindata->cc,
+ session->logindata->locale,
+ ( state == MXIT_STATE_REGISTER1 ) ? 0 : 1,
+ MXIT_CP_PLATFORM,
+ MXIT_CP_OS,
+ MXIT_CAPTCHA_HEIGHT,
+ MXIT_CAPTCHA_WIDTH,
+ time( NULL )
+ );
url_data = purple_util_fetch_url_request( session->acc, url, TRUE, MXIT_HTTP_USERAGENT, TRUE, NULL, FALSE, -1, mxit_cb_clientinfo2, session );
#ifdef DEBUG_PROTOCOL
============================================================
--- libpurple/protocols/mxit/protocol.c 4e4941fb7522eacaebfd6dbca67f7705c9b2e708
+++ libpurple/protocols/mxit/protocol.c 545661e850cd8a1e7afabdf0638e19f587692a57
@@ -458,7 +458,7 @@ static void mxit_queue_packet( struct MX
packet->headerlen = 0;
/* create generic packet header */
- hlen = snprintf( header, sizeof( header ), "id=%s%c", session->acc->username, CP_REC_TERM ); /* client msisdn */
+ hlen = snprintf( header, sizeof( header ), "id=%s%c", purple_account_get_username( session->acc), CP_REC_TERM ); /* client msisdn */
if ( session->http ) {
/* http connection only */
More information about the Commits
mailing list