mirror of
https://github.com/processone/ejabberd.git
synced 2024-08-14 01:38:09 +02:00
Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test"
This reverts commit00d8b2ac30
, reversing changes made tocac23c39c9
.
This commit is contained in:
parent
426b7ca769
commit
8d69d4aaba
@ -555,7 +555,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
|
||||
privacy_get_user_list, StateData#state.server,
|
||||
#userlist{},
|
||||
[U, StateData#state.server]),
|
||||
NewStateData = StateData#state{
|
||||
NewStateData = StateData#state{
|
||||
user = U,
|
||||
resource = R,
|
||||
jid = JID,
|
||||
|
@ -92,8 +92,7 @@ process_data(CallbackPid, Stack, Data) ->
|
||||
[{xmlelement, Name, Attrs, Els} | Tail] ->
|
||||
[{xmlelement, Name, Attrs, [{xmlcdata, CData} | Els]} |
|
||||
Tail];
|
||||
[] ->
|
||||
[]
|
||||
[] -> []
|
||||
end;
|
||||
{?XML_ERROR, Err} ->
|
||||
catch gen_fsm:send_event(CallbackPid, {xmlstreamerror, Err})
|
||||
|
Loading…
Reference in New Issue
Block a user