From 8d69d4aaba287d44d74a6fd6da00dd27038131bd Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Tue, 19 Oct 2010 13:52:17 +0300 Subject: [PATCH] Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test" This reverts commit 00d8b2ac30c08c8f02b9649169aaabe1463e39a4, reversing changes made to cac23c39c9db20e6421cf8903198aab48f104b3b. --- src/ejabberd_c2s.erl | 2 +- src/xml_stream.erl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 29fc967c3..69da0f6a5 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -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, diff --git a/src/xml_stream.erl b/src/xml_stream.erl index 947992ad0..f3aa5502d 100644 --- a/src/xml_stream.erl +++ b/src/xml_stream.erl @@ -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})