Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-08-14 01:38:09 +02:00
Code Releases Activity

Revert "Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x"

Browse Source 
This reverts commit f76dcd0d48, reversing
changes made to 7da8d9e4e3.
This commit is contained in:
Alexey Shchepin 2010-10-19 13:51:44 +03:00
parent d07424365d
commit b61d16dd33
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ejabberd_c2s.erl
View File

@ -2325,15 +2325,8 @@ roster_change(IJID, ISubscription, StateData) ->
update_priority(Priority, Packet, StateData) -> update_priority(Priority, Packet, StateData) ->
Info1 = [{ip, StateData#state.ip}, {conn, StateData#state.conn}, Info = [{ip, StateData#state.ip}, {conn, StateData#state.conn},
{auth_module, StateData#state.auth_module}], {auth_module, StateData#state.auth_module}],
Info =
case StateData#state.reception of
false ->
[{oor, true} | Info1];
_ ->
Info1
end,
ejabberd_sm:set_presence(StateData#state.sid, ejabberd_sm:set_presence(StateData#state.sid,
StateData#state.user, StateData#state.user,
StateData#state.server, StateData#state.server,
@ -2604,8 +2597,10 @@ change_reception(#state{reception = true} = StateData, false) ->
[{xmlelement, "show", [], [{xmlelement, "show", [],
[{xmlcdata, StateData#state.oor_show}]}, [{xmlcdata, StateData#state.oor_show}]},
{xmlelement, "status", [], {xmlelement, "status", [],
[{xmlcdata, StateData#state.oor_status}]}]}, [{xmlcdata, StateData#state.oor_status}]},
update_priority(0, Packet, StateData#state{reception = false}), {xmlelement, "priority", [],
[{xmlcdata, "0"}]}]},
update_priority(0, Packet, StateData),
presence_broadcast_to_trusted( presence_broadcast_to_trusted(
StateData, StateData,
StateData#state.jid, StateData#state.jid,
@ -2637,8 +2632,7 @@ change_reception(#state{reception = false} = StateData, true) ->
_ -> _ ->
Packet = StateData#state.pres_last, Packet = StateData#state.pres_last,
NewPriority = get_priority_from_presence(Packet), NewPriority = get_priority_from_presence(Packet),
update_priority(NewPriority, Packet, update_priority(NewPriority, Packet, StateData),
StateData#state{reception = true}),
presence_broadcast_to_trusted( presence_broadcast_to_trusted(
StateData, StateData,
StateData#state.jid, StateData#state.jid,