Mercurial > pidgin

comparison libpurple/savedstatuses.c @ 32819:2c6510167895 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents f75041cb3fec
children
comparison
equal deleted inserted replaced
32818:01ff09d4a463 32819:2c6510167895
385 { 385 {
386 char *acct_name; 386 char *acct_name;
387 const char *protocol; 387 const char *protocol;
388 acct_name = xmlnode_get_data(node); 388 acct_name = xmlnode_get_data(node);
389 protocol = xmlnode_get_attrib(node, "protocol"); 389 protocol = xmlnode_get_attrib(node, "protocol");
390 protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
391 if ((acct_name != NULL) && (protocol != NULL)) 390 if ((acct_name != NULL) && (protocol != NULL))
392 ret->account = purple_accounts_find(acct_name, protocol); 391 ret->account = purple_accounts_find(acct_name, protocol);
393 g_free(acct_name); 392 g_free(acct_name);
394 } 393 }
395 394
402 /* Read the state */ 401 /* Read the state */
403 node = xmlnode_get_child(substatus, "state"); 402 node = xmlnode_get_child(substatus, "state");
404 if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) 403 if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL))
405 { 404 {
406 ret->type = purple_status_type_find_with_id( 405 ret->type = purple_status_type_find_with_id(
407 ret->account->status_types, data); 406 purple_account_get_status_types(ret->account), data);
408 g_free(data); 407 g_free(data);
409 } 408 }
410 409
411 if (ret->type == NULL) 410 if (ret->type == NULL)
412 { 411 {