propagate from branch 'im.pidgin.pidgin' (head 1bc731764f9350e649865aa63550c744b0ec3d6f)

            to branch 'im.pidgin.pidgin.next.minor' (head ccb76c75d39f35f421e9f8756cab554c17d12416)

1 files changed, 9 insertions, 4 deletions

diff --git a/libpurple/account.c b/libpurple/account.c
index 75ac6ed27e..cadfe9b6f9 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -255,15 +255,20 @@ static xmlnode *
 statuses_to_xmlnode(const PurplePresence *presence)
 {
 	xmlnode *node, *child;
-	GList *statuses, *status;
+	GList *statuses;
+	PurpleStatus *status;
 
 	node = xmlnode_new("statuses");
 
 	statuses = purple_presence_get_statuses(presence);
-	for (status = statuses; status != NULL; status = status->next)
+	for (; statuses != NULL; statuses = statuses->next)
 	{
-		child = status_to_xmlnode((PurpleStatus *)status->data);
-		xmlnode_insert_child(node, child);
+		status = statuses->data;
+		if (purple_status_type_is_saveable(purple_status_get_type(status)))
+		{
+			child = status_to_xmlnode(status);
+			xmlnode_insert_child(node, child);
+		}
 	}
 
 	return node;