From d2eab0d5350cd2fc09987d43f39b7f00dde406d6 Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Fri, 9 Jul 2004 22:34:26 +0000
Subject: * doc/guide.tex: Updated

* src/msgs/fr.msg: Updated (thanks to Sergei Golovan)

* src/mod_irc/mod_irc.erl: Added handler for disco items requests
(thanks to Sergei Golovan)

* src/mod_vcard.erl: Added option for JUD disabling (thanks to
Sergei Golovan)

* src/mod_configure2.erl: Fixed module stopping (thanks to Sergei
Golovan)
* src/mod_last.erl: Likewise
* src/mod_privacy.erl: Likewise
* src/mod_register.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_vcard.erl: Likewise

* src/jd2ejd.erl: Added emergency catches (thanks to Sergei
Golovan)
* src/mod_last.erl: Likewise

* src/ejabberd_sm.erl: Removed needless call to
mod_disco:unregister_feature (thanks to Sergei Golovan)

* src/ejabberd_local.erl: Better support for mod_disco (thanks to
Sergei Golovan)
* src/mod_disco.erl: Likewise

* src/translate.erl: Suport for "default language" option (thanks
to Sergei Golovan)
* src/ejabberd_config.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd.hrl: Added 'MYLANG' macros

* src/ejabberd.cfg.example: Updated (thanks to Sergei Golovan)

* doc/guide.tex: Updated (thanks to Sergei Golovan)

* src/win32/ejabberd.cfg: Updated (thanks to Sergei Golovan)

SVN Revision: 241
---
 src/jd2ejd.erl | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'src/jd2ejd.erl')

diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl
index 8bcbb30fe..1fff78149 100644
--- a/src/jd2ejd.erl
+++ b/src/jd2ejd.erl
@@ -105,38 +105,39 @@ xdb_data({xmlstreamelement, El}, StateData) ->
 		ejabberd_auth:set_password(StateData#state.user, Password),
 		StateData;
 	    ?NS_ROSTER ->
-		%mod_roster:process_iq(From,
-		%		      {"", ?MYNAME, ""},
-		%		      #iq{type = set, xmlns = ?NS_ROSTER, sub_el = El}),
-		mod_roster:set_items(StateData#state.user, El),
+		%catch mod_roster:process_iq(
+		%	 From,
+		%	 {"", ?MYNAME, ""},
+		%	 #iq{type = set, xmlns = ?NS_ROSTER, sub_el = El}),
+		catch mod_roster:set_items(StateData#state.user, El),
 		StateData;
 	    ?NS_VCARD ->
-		mod_vcard:process_sm_iq(
-		  From,
-		  jlib:make_jid("", ?MYNAME, ""),
-		  #iq{type = set, xmlns = ?NS_VCARD, sub_el = El}),
+		catch mod_vcard:process_sm_iq(
+			From,
+			jlib:make_jid("", ?MYNAME, ""),
+			#iq{type = set, xmlns = ?NS_VCARD, sub_el = El}),
 		StateData;
 	    "jabber:x:offline" ->
 		process_offline(From, El),
 		StateData;
 	    %?NS_REGISTER ->
-	    %    mod_register:process_iq(
-	    %      {"", "", ""}, {"", ?MYNAME, ""},
-	    %      #iq{type =set, xmlns = ?NS_REGISTER, xub_el = El}),
+	    %    catch mod_register:process_iq(
+	    %		 {"", "", ""}, {"", ?MYNAME, ""},
+	    %		 #iq{type =set, xmlns = ?NS_REGISTER, xub_el = El}),
 	    %    User = xml:get_path_s(El, [{elem, "username"}, cdata]),
 	    %    io:format("user ~s~n", [User]),
 	    %    StateData;
 	    XMLNS ->
 		case xml:get_attr_s("j_private_flag", Attrs) of
 		    "1" ->
-			mod_private:process_local_iq(
-			  From,
-			  jlib:make_jid("", ?MYNAME, ""),
-			  #iq{type = set, xmlns = ?NS_PRIVATE,
-			      sub_el = {xmlelement, "query", [],
-					[jlib:remove_attr(
-					   "j_private_flag",
-					   jlib:remove_attr("xdbns", El))]}}),
+			catch mod_private:process_local_iq(
+				From,
+				jlib:make_jid("", ?MYNAME, ""),
+				#iq{type = set, xmlns = ?NS_PRIVATE,
+				    sub_el = {xmlelement, "query", [],
+					      [jlib:remove_attr(
+						 "j_private_flag",
+						 jlib:remove_attr("xdbns", El))]}}),
 			StateData;
 		    _ ->
 			io:format("jd2ejd: Unknown namespace \"~s\"~n",
@@ -232,7 +233,7 @@ process_offline(To, {xmlelement, _, _, Els}) ->
 			      error ->
 				  ok;
 			      _ ->
-				  mod_offline:store_packet(From, To, El)
+				  catch mod_offline:store_packet(From, To, El)
 			  end
 		  end, Els).
 
-- 
cgit v1.2.3