equal
deleted
inserted
replaced
589 return; |
589 return; |
590 } |
590 } |
591 |
591 |
592 room_elt = roster_find(room, jidsearch, ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); |
592 room_elt = roster_find(room, jidsearch, ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); |
593 // Add room if it doesn't already exist |
593 // Add room if it doesn't already exist |
594 if (!room_elt) |
594 if (!room_elt) { |
595 room_elt = roster_add_user(room, NULL, NULL, ROSTER_TYPE_ROOM, sub_none); |
595 room_elt = roster_add_user(room, NULL, NULL, ROSTER_TYPE_ROOM, sub_none); |
|
596 } else { |
|
597 // Make sure this is a room (it can be a conversion user->room) |
|
598 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
|
599 } |
596 // If insideroom is TRUE, this is a nickname change and we don't care here |
600 // If insideroom is TRUE, this is a nickname change and we don't care here |
597 if (!buddy_getinsideroom(room_elt->data)) { |
601 if (!buddy_getinsideroom(room_elt->data)) { |
598 // We're trying to enter a room |
602 // We're trying to enter a room |
599 buddy_setnickname(room_elt->data, nickname); |
603 buddy_setnickname(room_elt->data, nickname); |
600 } |
604 } |