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

jabber: wait until full room roster received before showing

Browse Source
This commit is contained in:
James Booth
2012-11-07 22:24:50 +00:00
parent 5fe12bbd15
commit 54e591fea3
5 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/jabber.c
View File

@@ -655,13 +655,27 @@ _presence_handler(xmpp_conn_t * const conn,
char *from = xmpp_stanza_get_attribute(stanza, "from");
// handle chat room presence
if (room_is_active(from)) {
char **tokens = g_strsplit(from, "/", 0);
char *room_jid = tokens[0];
char *nick = tokens[1];
if (strcmp(room_get_nick_for_room(room_jid), nick) != 0) {
prof_handle_chat_room_member(room_jid, nick);
char *room = NULL;
char *nick = NULL;
if (!room_parse_room_jid(from, &room, &nick)) {
log_error("Could not parse room jid: %s", room);
g_free(room);
g_free(nick);
return 1;
}
// handle self presence (means room roster has been sent)
if (strcmp(room_get_nick_for_room(room), nick) == 0) {
prof_handle_room_roster_complete(room);
} else {
room_add_to_roster(room, nick);
}
// handle regular presence
} else {
char *short_from = strtok(from, "/");
char *type = xmpp_stanza_get_attribute(stanza, "type");