Mercurial > ~mikael > mcabber > hg
comparison mcabber/src/jabglue.c @ 1355:9716cf8a0726
Add on_server flag
Add a flag to the roster data, TRUE if the roster item is known by the server.
The command /info displays a message if the item is local.
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 10 Nov 2007 23:15:16 +0100 |
parents | c373ff3fe7e1 |
children | 32077249de77 |
comparison
equal
deleted
inserted
replaced
1354:c373ff3fe7e1 | 1355:9716cf8a0726 |
---|---|
1029 jab_send(jc, iqn->xmldata); | 1029 jab_send(jc, iqn->xmldata); |
1030 iqs_del(iqn->id); // XXX | 1030 iqs_del(iqn->id); // XXX |
1031 | 1031 |
1032 jb_subscr_request_auth(cleanjid); | 1032 jb_subscr_request_auth(cleanjid); |
1033 | 1033 |
1034 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending); | 1034 roster_add_user(cleanjid, name, group, ROSTER_TYPE_USER, sub_pending, -1); |
1035 g_free(cleanjid); | 1035 g_free(cleanjid); |
1036 buddylist_build(); | 1036 buddylist_build(); |
1037 | 1037 |
1038 update_roster = TRUE; | 1038 update_roster = TRUE; |
1039 } | 1039 } |
1188 } | 1188 } |
1189 | 1189 |
1190 room_elt = roster_find(room, jidsearch, ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); | 1190 room_elt = roster_find(room, jidsearch, ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); |
1191 // Add room if it doesn't already exist | 1191 // Add room if it doesn't already exist |
1192 if (!room_elt) { | 1192 if (!room_elt) { |
1193 room_elt = roster_add_user(room, NULL, NULL, ROSTER_TYPE_ROOM, sub_none); | 1193 room_elt = roster_add_user(room, NULL, NULL, ROSTER_TYPE_ROOM, |
1194 sub_none, -1); | |
1194 } else { | 1195 } else { |
1195 // Make sure this is a room (it can be a conversion user->room) | 1196 // Make sure this is a room (it can be a conversion user->room) |
1196 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); | 1197 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
1197 } | 1198 } |
1198 // If insideroom is TRUE, this is a nickname change and we don't care here | 1199 // If insideroom is TRUE, this is a nickname change and we don't care here |
1747 | 1748 |
1748 // MUC | 1749 // MUC |
1749 // Make sure this is a room (it can be a conversion user->room) | 1750 // Make sure this is a room (it can be a conversion user->room) |
1750 room_elt = roster_find(bjid, jidsearch, 0); | 1751 room_elt = roster_find(bjid, jidsearch, 0); |
1751 if (!room_elt) { | 1752 if (!room_elt) { |
1752 room_elt = roster_add_user(bjid, NULL, NULL, ROSTER_TYPE_ROOM, sub_none); | 1753 room_elt = roster_add_user(bjid, NULL, NULL, ROSTER_TYPE_ROOM, |
1754 sub_none, -1); | |
1753 } else { | 1755 } else { |
1754 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); | 1756 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
1755 } | 1757 } |
1756 | 1758 |
1757 buddylist_build(); | 1759 buddylist_build(); |
1986 room_elt = roster_find(roomjid, jidsearch, 0); | 1988 room_elt = roster_find(roomjid, jidsearch, 0); |
1987 if (!room_elt) { | 1989 if (!room_elt) { |
1988 // Add room if it doesn't already exist | 1990 // Add room if it doesn't already exist |
1989 // It shouldn't happen, there is probably something wrong (server or | 1991 // It shouldn't happen, there is probably something wrong (server or |
1990 // network issue?) | 1992 // network issue?) |
1991 room_elt = roster_add_user(roomjid, NULL, NULL, ROSTER_TYPE_ROOM, sub_none); | 1993 room_elt = roster_add_user(roomjid, NULL, NULL, ROSTER_TYPE_ROOM, |
1994 sub_none, -1); | |
1992 scr_LogPrint(LPRINT_LOGNORM, "Strange MUC presence message"); | 1995 scr_LogPrint(LPRINT_LOGNORM, "Strange MUC presence message"); |
1993 } else { | 1996 } else { |
1994 // Make sure this is a room (it can be a conversion user->room) | 1997 // Make sure this is a room (it can be a conversion user->room) |
1995 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); | 1998 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
1996 } | 1999 } |