From b61d16dd33c766c4b37bb91fbc48ede25d872236 Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Tue, 19 Oct 2010 13:51:44 +0300 Subject: [PATCH] Revert "Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x" This reverts commit f76dcd0d486d5fc5a1a1bd42a20670f0b4242a0b, reversing changes made to 7da8d9e4e371c586d2a48aee8dc3717d840f98b5. --- src/ejabberd_c2s.erl | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index b894ee6b7..a89440080 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -2325,15 +2325,8 @@ roster_change(IJID, ISubscription, StateData) -> update_priority(Priority, Packet, StateData) -> - Info1 = [{ip, StateData#state.ip}, {conn, StateData#state.conn}, - {auth_module, StateData#state.auth_module}], - Info = - case StateData#state.reception of - false -> - [{oor, true} | Info1]; - _ -> - Info1 - end, + Info = [{ip, StateData#state.ip}, {conn, StateData#state.conn}, + {auth_module, StateData#state.auth_module}], ejabberd_sm:set_presence(StateData#state.sid, StateData#state.user, StateData#state.server, @@ -2604,8 +2597,10 @@ change_reception(#state{reception = true} = StateData, false) -> [{xmlelement, "show", [], [{xmlcdata, StateData#state.oor_show}]}, {xmlelement, "status", [], - [{xmlcdata, StateData#state.oor_status}]}]}, - update_priority(0, Packet, StateData#state{reception = false}), + [{xmlcdata, StateData#state.oor_status}]}, + {xmlelement, "priority", [], + [{xmlcdata, "0"}]}]}, + update_priority(0, Packet, StateData), presence_broadcast_to_trusted( StateData, StateData#state.jid, @@ -2637,8 +2632,7 @@ change_reception(#state{reception = false} = StateData, true) -> _ -> Packet = StateData#state.pres_last, NewPriority = get_priority_from_presence(Packet), - update_priority(NewPriority, Packet, - StateData#state{reception = true}), + update_priority(NewPriority, Packet, StateData), presence_broadcast_to_trusted( StateData, StateData#state.jid,