flash hack merge fix from BBC

src/ejabberd_c2s.erl

@@ -68,42 +68,6 @@
 -include("mod_privacy.hrl").
 -include("ejabberd_c2s.hrl").
 
--define(SETS, gb_sets).
--define(DICT, dict).
-
-%% pres_a contains all the presence available send (either through roster mechanism or directed).
-%% Directed presence unavailable remove user from pres_a.
--record(state, {socket,
-		sockmod,
-		socket_monitor,
-		xml_socket,
-		streamid,
-		sasl_state,
-		access,
-		shaper,
-		zlib = false,
-		tls = false,
-		tls_required = false,
-		tls_enabled = false,
-		tls_options = [],
-		authenticated = false,
-		jid,
-		user = "", server = ?MYNAME, resource = "",
-		sid,
-		pres_t = ?SETS:new(),
-		pres_f = ?SETS:new(),
-		pres_a = ?SETS:new(),
-		pres_i = ?SETS:new(),
-		pres_last, pres_pri,
-		pres_timestamp,
-		pres_invis = false,
-		privacy_list = #userlist{},
-		conn = unknown,
-		auth_module = unknown,
-		ip,
-		lang,
-		flash_connection = false}).
-
 %-define(DBGFSM, true).
 
 -ifdef(DBGFSM).

src/ejabberd_c2s.hrl

@@ -59,4 +59,5 @@
 		ip,
 		fsm_limit_opts,
 		lang,
-		debug=false}).
+		debug=false,
+		flash_connection = false}).