equal
deleted
inserted
replaced
307 if (strchr(cleanalias, JID_DOMAIN_SEPARATOR)) |
307 if (strchr(cleanalias, JID_DOMAIN_SEPARATOR)) |
308 roster_type = ROSTER_TYPE_USER; |
308 roster_type = ROSTER_TYPE_USER; |
309 else |
309 else |
310 roster_type = ROSTER_TYPE_AGENT; |
310 roster_type = ROSTER_TYPE_AGENT; |
311 |
311 |
312 roster_add_user(cleanalias, name, group, roster_type, esub); |
312 roster_add_user(cleanalias, name, group, roster_type, esub, 1); |
313 |
313 |
314 g_free(name_tmp); |
314 g_free(name_tmp); |
315 g_free(cleanalias); |
315 g_free(cleanalias); |
316 } |
316 } |
317 |
317 |
753 bjid = jidtodisp(fjid); // Bare jid |
753 bjid = jidtodisp(fjid); // Bare jid |
754 |
754 |
755 // Make sure this is a room (it can be a conversion user->room) |
755 // Make sure this is a room (it can be a conversion user->room) |
756 room_elt = roster_find(bjid, jidsearch, 0); |
756 room_elt = roster_find(bjid, jidsearch, 0); |
757 if (!room_elt) { |
757 if (!room_elt) { |
758 room_elt = roster_add_user(bjid, name, NULL, ROSTER_TYPE_ROOM, sub_none); |
758 room_elt = roster_add_user(bjid, name, NULL, ROSTER_TYPE_ROOM, |
|
759 sub_none, -1); |
759 } else { |
760 } else { |
760 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
761 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
761 /* |
762 /* |
762 // If the name is available, should we use it? |
763 // If the name is available, should we use it? |
763 // I don't think so, it would be confusing because this item is already |
764 // I don't think so, it would be confusing because this item is already |