Mercurial > pidgin.yaz
diff src/savedstatuses.c @ 10426:30d9ec7d001b
[gaim-migrate @ 11678]
Some rather key fixes to accounts and saved statuses, and make
blist use our util function for reading (it's already using xmlnode).
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 26 Dec 2004 23:11:14 +0000 |
parents | 9903182f2aac |
children | 16d63d8c26d8 |
line wrap: on
line diff
--- a/src/savedstatuses.c Sun Dec 26 22:52:52 2004 +0000 +++ b/src/savedstatuses.c Sun Dec 26 23:11:14 2004 +0000 @@ -238,7 +238,7 @@ /* Read the state */ node = xmlnode_get_child(substatus, "state"); - if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) + if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) { ret->type = gaim_status_type_find_with_id( ret->account->status_types, data); @@ -247,7 +247,7 @@ /* Read the message */ node = xmlnode_get_child(substatus, "message"); - if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) + if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) { ret->message = data; } @@ -306,7 +306,7 @@ /* Read the primitive status type */ node = xmlnode_get_child(status, "state"); - if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) + if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) { ret->type = gaim_primitive_get_type_from_id(data); g_free(data); @@ -314,7 +314,7 @@ /* Read the message */ node = xmlnode_get_child(status, "message"); - if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) + if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) { ret->message = data; } @@ -343,6 +343,8 @@ { xmlnode *statuses, *status; + statuses_loaded = TRUE; + statuses = gaim_util_read_xml_from_file("status.xml", _("saved statuses")); if (statuses == NULL)