From c62a0562a1745f9cd1b98d2b33bb426beb20b05c Mon Sep 17 00:00:00 2001 From: Badlop Date: Thu, 13 Mar 2008 14:13:29 +0000 Subject: [PATCH] * src/ejabberd.hrl: Removed unused ejabberd_debug and PRIVACY_SUPPORT. Reordered the remaining options SVN Revision: 1230 --- ChangeLog | 3 +++ src/ejabberd.hrl | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74770e8e7..ee3bf9251 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-13 Badlop + * src/ejabberd.hrl: Removed unused ejabberd_debug and + PRIVACY_SUPPORT. Reordered the remaining options + * doc/guide.tex: Describe option Matches in mod_vcard_ldap (thanks to Evgeniy Khramtsov)(EJAB-530). Fix typo in the description of ldap_server option. diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl index 2820c84fd..c3b7deab8 100644 --- a/src/ejabberd.hrl +++ b/src/ejabberd.hrl @@ -19,11 +19,22 @@ %%% %%%---------------------------------------------------------------------- -%-define(ejabberd_debug, true). -%-define(DBGFSM, true). - -define(VERSION, "2.0.0"). +-define(MYHOSTS, ejabberd_config:get_global_option(hosts)). +-define(MYNAME, hd(ejabberd_config:get_global_option(hosts))). +-define(MYLANG, ejabberd_config:get_global_option(language)). + +-define(MSGS_DIR, "msgs"). +-define(CONFIG_PATH, "ejabberd.cfg"). +-define(LOG_PATH, "ejabberd.log"). + +-define(EJABBERD_URI, "http://www.process-one.net/en/ejabberd/"). + +-define(S2STIMEOUT, 600000). + +%%-define(DBGFSM, true). + %% --------------------------------- %% Logging mechanism @@ -42,15 +53,3 @@ -define(CRITICAL_MSG(Format, Args), ejabberd_logger:critical_msg(?MODULE,?LINE,Format, Args)). --define(MYHOSTS, ejabberd_config:get_global_option(hosts)). --define(MYNAME, hd(ejabberd_config:get_global_option(hosts))). --define(S2STIMEOUT, 600000). --define(MYLANG, ejabberd_config:get_global_option(language)). - --define(MSGS_DIR, "msgs"). --define(CONFIG_PATH, "ejabberd.cfg"). --define(LOG_PATH, "ejabberd.log"). - --define(PRIVACY_SUPPORT, true). - --define(EJABBERD_URI, "http://www.process-one.net/en/ejabberd/").