[svn-commits] pabelanger: branch 1.4 r289703 - in /branches/1.4: configs/ res/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Fri Oct  1 12:03:11 2010
New Revision: 289703

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289703
Log:
Disable debugging by default

and reformat .config file.

Review: https://reviewboard.asterisk.org/r/929/ 

Modified:
    branches/1.4/configs/jabber.conf.sample
    branches/1.4/res/res_jabber.c

Modified: branches/1.4/configs/jabber.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/configs/jabber.conf.sample?view=diff&rev=289703&r1=289702&r2=289703
==============================================================================
--- branches/1.4/configs/jabber.conf.sample (original)
+++ branches/1.4/configs/jabber.conf.sample Fri Oct  1 12:03:11 2010
@@ -1,18 +1,16 @@
 [general]
-;debug=yes				;;Turn on debugging by default.
-;autoprune=yes				;;Auto remove users from buddy list.
-;autoregister=yes			;;Auto register users from buddy list. 
+;debug=yes                              ; Enable debugging (disabled by default).
+;autoprune=yes				; Auto remove users from buddy list.
+;autoregister=yes			; Auto register users from buddy list. 
 
-;[asterisk]				;;label
-;type=client				;;Client or Component connection
-;serverhost=astjab.org			;;Route to server for example,
-					;;	talk.google.com
-;username=asterisk at astjab.org/asterisk	;;Username with optional roster.
-;secret=blah				;;Password
-;port=5222				;;Port to use defaults to 5222
-;usetls=yes				;;Use tls or not
-;usesasl=yes				;;Use sasl or not
-;buddy=mogorman at astjab.org		;;Manual addition of buddy to list.
-;statusmessage="I am available"		;;Have custom status message for
-					;;Asterisk.
-;timeout=100				;;Timeout on the message stack.
+;[asterisk]
+;type=client				; Client or Component connection
+;serverhost=astjab.org			; Route to server for example, talk.google.com
+;username=asterisk at astjab.org/asterisk	; Username with optional roster.
+;secret=blah				; Password
+;port=5222				; Port to use defaults to 5222
+;usetls=yes				; Use tls or not
+;usesasl=yes				; Use sasl or not
+;buddy=mogorman at astjab.org		; Manual addition of buddy to list.
+;statusmessage="I am available"		; Have custom status message for Asterisk
+;timeout=100				; Timeout on the message stack.

Modified: branches/1.4/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_jabber.c?view=diff&rev=289703&r1=289702&r2=289703
==============================================================================
--- branches/1.4/res/res_jabber.c (original)
+++ branches/1.4/res/res_jabber.c Fri Oct  1 12:03:11 2010
@@ -2324,7 +2324,7 @@
 static int aji_load_config(void)
 {
 	char *cat = NULL;
-	int debug = 1;
+	int debug = 0;
 	struct ast_config *cfg = NULL;
 	struct ast_variable *var = NULL;