Mercurial > hg
comparison mcabber/src/commands.c @ 652:b243d3b3ff1b
We do not need buddy_isresource() anymore
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 07 Jan 2006 10:56:46 +0100 |
parents | c2d50b97ced4 |
children | d5db5be78eb0 |
comparison
equal
deleted
inserted
replaced
651:936df057dda0 | 652:b243d3b3ff1b |
---|---|
596 if (!jid) return; | 596 if (!jid) return; |
597 | 597 |
598 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM) { | 598 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM) { |
599 // This is a chatroom | 599 // This is a chatroom |
600 // If there are resources, we haven't left | 600 // If there are resources, we haven't left |
601 if (buddy_isresource(BUDDATA(current_buddy))) { | 601 if (buddy_getinsideroom(BUDDATA(current_buddy))) { |
602 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); | 602 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
603 return; | 603 return; |
604 } | 604 } |
605 } | 605 } |
606 | 606 |
1539 scr_LogPrint(LPRINT_NORMAL, "Unknown parameter"); | 1539 scr_LogPrint(LPRINT_NORMAL, "Unknown parameter"); |
1540 return; | 1540 return; |
1541 } | 1541 } |
1542 | 1542 |
1543 // Quick check: if there are resources, we haven't left | 1543 // Quick check: if there are resources, we haven't left |
1544 if (buddy_isresource(bud)) { | 1544 if (buddy_getinsideroom(bud)) { |
1545 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); | 1545 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
1546 return; | 1546 return; |
1547 } | 1547 } |
1548 // Delete the room | 1548 // Delete the room |
1549 roster_del_user(buddy_getjid(bud)); | 1549 roster_del_user(buddy_getjid(bud)); |