* src/mod_announce.erl: Bugfix (thanks to Christophe Romain)

SVN Revision: 992

2 files changed, 41 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c3085126..f0081b72d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,55 +1,60 @@
+2007-11-27  Alexey Shchepin  <alexey@process-one.net>
+
+	* src/mod_announce.erl: Bugfix (thanks to Christophe Romain)
+
 2007-11-27  Badlop  <badlop@process-one.net>
 
 	* doc/guide.tex: Added clarification about LDAP default port
 	(thanks to Christophe Romain).
-	
-	* src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE 
+
+	* src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE
 	registry (EJAB-328).
 	* src/mod_vcard_ldap.erl: Likewise.
 	* src/mod_vcard_odbc.erl: Likewise.
 	* doc/guide.tex: Updated documentation.
 
-	* src/mod_muc/mod_muc_room.erl: Don't show the room name as 
-	the room description (EJAB-382).
+	* src/mod_muc/mod_muc_room.erl: Don't show the room name as the
+	room description (EJAB-382).
 
 2007-11-26  Badlop  <badlop@process-one.net>
 
-	* src/ejabberd.cfg.example: Added example configuration of databases.
+	* src/ejabberd.cfg.example: Added example configuration of
+	databases.
 
 	* doc/guide.tex: Fixed several typos.
 
-	* src/ejabberd_config.erl: Print error when the configuration 
-	requires ODBC, MySQL or PostgreSQL libraries but are not 
-	installed (EJAB-210).
+	* src/ejabberd_config.erl: Print error when the configuration
+	requires ODBC, MySQL or PostgreSQL libraries but are not installed
+	(EJAB-210).
 
 	* src/web/ejabberd_web_admin.erl: Added a favicon (EJAB-379).
 
-	* src/msgs/wa.msg: New Walon translation (thanks to 
-	Pablo Saratxaga) (EJAB-374).
+	* src/msgs/wa.msg: New Walon translation (thanks to Pablo
+	Saratxaga) (EJAB-374).
 
 	* doc/guide.tex: Describe how ejabberd treats ejabberd.cfg file
 	(EJAB-384).
 
-	* src/ejabberd.cfg.example: Huge reorganization and grouping of 
+	* src/ejabberd.cfg.example: Huge reorganization and grouping of
 	options (EJAB-392).
 
-	* doc/guide.tex: Describe in mod_muc: nick register and service 
+	* doc/guide.tex: Describe in mod_muc: nick register and service
 	admin message (EJAB-400).
 
-	* src/mod_echo.erl: Example function that demonstrates how to 
-	receive XMPP packets using Erlang's message passing mechanism 
+	* src/mod_echo.erl: Example function that demonstrates how to
+	receive XMPP packets using Erlang's message passing mechanism
 	(EJAB-247).
 
-	* src/ejabberdctl.template: Removed bashisms (EJAB-399). Set 
-	environment variables instead of passing parameters when 
-	calling erl (EJAB-421). Write erl_crash.dump in the log/ 
-	directory, with unique filename (EJAB-433).
+	* src/ejabberdctl.template: Removed bashisms (EJAB-399). Set
+	environment variables instead of passing parameters when calling
+	erl (EJAB-421). Write erl_crash.dump in the log/ directory, with
+	unique filename (EJAB-433).
 
-	* src/ejabberd_ctl.erl: Improvements in the help messages 
+	* src/ejabberd_ctl.erl: Improvements in the help messages
 	(EJAB-399).
 
-	* doc/guide.tex: Improvements in sections ejabberdctl, and 
-	Install from Source (EJAB-399).
+	* doc/guide.tex: Improvements in sections ejabberdctl, and Install
+	from Source (EJAB-399).
 
 2007-11-25  Alexey Shchepin  <alexey@process-one.net>
 
@@ -77,8 +82,8 @@
 
 2007-11-05  Mickael Remond  <mremond@process-one.net>
 
-	* src/ejabberd_config.erl: Refactoring: Move internal
-	data structure to an include file.
+	* src/ejabberd_config.erl: Refactoring: Move internal data
+	structure to an include file.
 	* src/ejabberd_config.hrl: Likewise.
 
 2007-11-03  Mickael Remond  <mremond@process-one.net>
@@ -93,7 +98,7 @@
 	* src/web/ejabberd_http_poll.erl: Refactoring. Moved c2s limits
 	acquisition to a separate module.
 	* src/ejabberd_c2s_config.erl: Likewise.
-	
+
 2007-11-01  Mickael Remond  <mremond@process-one.net>
 
 	* src/web/ejabberd_http_poll.erl: Support for c2s ACL access,
@@ -109,7 +114,7 @@
 2007-10-23  Christophe Romain  <christophe.romain@process-one.net>
 
 	* doc/dev.tex: Added extauth script details (EJAB-334)
-	
+
 2007-10-17  Christophe Romain  <christophe.romain@process-one.net>
 
 	* src/ejabberdctl.template: Bugfix on previous change (EJAB-380)
@@ -137,7 +142,7 @@
 
 2007-10-01  Alexey Shchepin  <alexey@process-one.net>
 
-	* src/ejabberd_auth_pam.erl: Support for PAM authentication (EJAB-307) 
+	* src/ejabberd_auth_pam.erl: Support for PAM authentication (EJAB-307)
 	(thanks to Evgeniy Khramtsov)
 	* src/ejabberd.cfg.example: Likewise
 	* src/configure.ac: Likewise
@@ -156,7 +161,7 @@
 
 	* src/ejabberdctl.template: apply rootdir patch from Badlop (EJAB-385)
 	* tools/ejabberdctl: define EJABBERD_EBIN as from ejabberdctl.template
-    
+
 2007-09-25  Alexey Shchepin  <alexey@process-one.net>
 
 	* src/ejabberd_s2s.erl: Max number of connections and max number
@@ -168,33 +173,33 @@
 	* src/ejabberd_s2s_out.erl: Changed to actual p1_fsm behaviour. It
 	was working correctly as the API of p1_fsm and gen_fsm is strictly
 	the same.
-	
+
 	* src/ejabberd_s2s_in.erl: Added debug hook for s2s loop (EJAB-358).
-	
+
 	* src/ejabberd_c2s.erl: Added debug hook for c2s loop (EJAB-358).
-	
+
 	* src/ejabberd_s2s.erl: open all missing connections if
 	needed (Jerome Sautret).
-	
+
 	* src/ejabberd_s2s.erl: don't check blacklist for services (Jerome
 	Sautret).
-	
+
 	* src/ejabberd_s2s.erl: Try to open all s2s connections at the
 	same time, to guarantee the right order of the packets (Jerome
 	Sautret).
-	
+
 	* src/ejabberd_s2s.erl: max_s2s_connexions_number local parameter
 	added (Jerome Sautret).
 
 	* src/ejabberd_s2s_out.erl: Implements s2s negociation timeouts
 	and s2s connection retrial interval (EJAB-357, EJAB-294).
-	
+
 	* src/ejabberd_c2s.erl: Implements timeouts during session opening
 	negociation (EJAB-355).
 
 	* doc/guide.tex: Documentation for new configure option
 	--disable-transient-supersisors (EJAB-354).
-	
+
 	* src/ejabberd_c2s.erl: Option to prevent the use of Erlang OTP
 	supervisor for transient processes (EJAB-354).
 	* src/ejabberd_s2s_in.erl: Likewise.
diff --git a/src/mod_announce.erl b/src/mod_announce.erl
index 8dbf469c9..5f1864682 100644
--- a/src/mod_announce.erl
+++ b/src/mod_announce.erl
@@ -101,7 +101,7 @@ stop(Host) ->
     ejabberd_hooks:delete(disco_local_items, Host, ?MODULE, disco_items, 50),
     ejabberd_hooks:delete(local_send_to_resource_hook, Host,
 			  ?MODULE, announce, 50),
-    ejabberd_hooks:delete(sm_register_connection_hook, Host,
+    ejabberd_hooks:delete(user_available_hook, Host,
 			  ?MODULE, send_motd, 50),
     Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
     exit(whereis(Proc), stop),