[asterisk-commits] pabelanger: branch 1.6.2 r289704 - in /branches/1.6.2: ./ configs/ res/

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Fri Oct  1 12:09:03 2010
New Revision: 289704

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289704
Log:
Merged revisions 289703 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r289703 | pabelanger | 2010-10-01 13:03:11 -0400 (Fri, 01 Oct 2010) | 6 lines
  
  Disable debugging by default
  
  and reformat .config file.
  
  Review: https://reviewboard.asterisk.org/r/929/ 
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configs/jabber.conf.sample
    branches/1.6.2/res/res_jabber.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/configs/jabber.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configs/jabber.conf.sample?view=diff&rev=289704&r1=289703&r2=289704
==============================================================================
--- branches/1.6.2/configs/jabber.conf.sample (original)
+++ branches/1.6.2/configs/jabber.conf.sample Fri Oct  1 12:09:03 2010
@@ -1,23 +1,19 @@
 [general]
-;debug=yes				;;Turn on debugging by default.
-;autoprune=yes				;;Auto remove users from buddy list. Depending on your
-					;;setup (ie, using your personal Gtalk account for a test)
-					;;you might lose your contacts list. Default is 'no'.
-;autoregister=yes			;;Auto register users from buddy list.
+;debug=yes                              ; Enable debugging (disabled by default).
+;autoprune=yes				; Auto remove users from buddy list. Depending on your
+					; setup (ie, using your personal Gtalk account for a test)
+					; you might lose your contacts list. Default is 'no'.
+;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 resource.
-;secret=blah				;;Password
-;priority=1				;;Resource priority
-;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.
-;status=available			;;One of: chat, available, away,
-					;;	xaway, or dnd
-;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 resource.
+;secret=blah				; Password
+;priority=1				; Resource priority
+;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.6.2/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_jabber.c?view=diff&rev=289704&r1=289703&r2=289704
==============================================================================
--- branches/1.6.2/res/res_jabber.c (original)
+++ branches/1.6.2/res/res_jabber.c Fri Oct  1 12:09:03 2010
@@ -2897,7 +2897,7 @@
 static int aji_load_config(int reload)
 {
 	char *cat = NULL;
-	int debug = 1;
+	int debug = 0;
 	struct ast_config *cfg = NULL;
 	struct ast_variable *var = NULL;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };