devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Bookmarks: Move stanza pointer on in loop, check for autojoin "true"

Browse Source
This commit is contained in:
James Booth
2013-07-15 00:52:47 +01:00
parent 5cb136225e
commit 7906bd6a9d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xmpp/bookmark.c
View File

@@ -144,11 +144,13 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
ptr = xmpp_stanza_get_children(ptr); ptr = xmpp_stanza_get_children(ptr);
while (ptr) { while (ptr) {
name = xmpp_stanza_get_name(ptr); name = xmpp_stanza_get_name(ptr);
if (strcmp(name, STANZA_NAME_CONFERENCE) != 0) { if (!name || strcmp(name, STANZA_NAME_CONFERENCE) != 0) {
ptr = xmpp_stanza_get_next(ptr);
continue; continue;
} }
jid = xmpp_stanza_get_attribute(ptr, STANZA_ATTR_JID); jid = xmpp_stanza_get_attribute(ptr, STANZA_ATTR_JID);
if (!jid) { if (!jid) {
ptr = xmpp_stanza_get_next(ptr);
continue; continue;
} }
@@ -166,7 +168,7 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
} }
autojoin = xmpp_stanza_get_attribute(ptr, "autojoin"); autojoin = xmpp_stanza_get_attribute(ptr, "autojoin");
if (autojoin && strcmp(autojoin, "1") == 0) { if (autojoin && (strcmp(autojoin, "1") == 0 || strcmp(autojoin, "true") == 0)) {
autojoin_val = TRUE; autojoin_val = TRUE;
} else { } else {
autojoin_val = FALSE; autojoin_val = FALSE;