Merged revisions 289718 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289718 | pabelanger | 2010-10-01 13:19:49 -0400 (Fri, 01 Oct 2010) | 20 lines
  
  Merged revisions 289704 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289704 | pabelanger | 2010-10-01 13:09:03 -0400 (Fri, 01 Oct 2010) | 13 lines
    
    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/ 
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@289732 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 36 insertions, 41 deletions

diff --git a/configs/jabber.conf.sample b/configs/jabber.conf.sample
index d02a7b301..098122d91 100644
--- a/configs/jabber.conf.sample
+++ b/configs/jabber.conf.sample
@@ -1,41 +1,36 @@
 [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.
-;collection_nodes=yes                   ;;Enable support for XEP-0248 for use with
-                                        ;;distributed device state.  Default is 'no'.
-;pubsub_autocreate=yes                  ;;Whether or not the PubSub server supports/is using
-                                        ;;auto-create for nodes.  If it is, we have to
-                                        ;;explicitly pre-create nodes before publishing them.
-                                        ;;Default is 'no'.
-;auth_policy=accept                     ;;Auto accept users' subscription requests (default).
-                                        ;;Set to deny for auto denial.
-
-
-;[asterisk]                             ;;label
-;type=client                            ;;Client or Component connection
-;serverhost=astjab.org                  ;;Route to server for example,
-                                        ;;	talk.google.com
-;pubsub_node=pubsub.astjab.org          ;;Node to use for publishing events via PubSub
-;username=asterisk@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@astjab.org              ;;Manual addition of buddy to list.
-                                        ;;For distributed events, these buddies are
-                                        ;;automatically added in the whitelist as
-                                        ;;'owners' of the node(s).
-;distribute_events=yes                  ;;Whether or not to distribute events using
-                                        ;;this connection.  Default is 'no'.
-;status=available                       ;;One of: chat, available, away,
-                                        ;;	xaway, or dnd
-;statusmessage="I am available"         ;;Have custom status message for
-                                        ;;Asterisk.
-;timeout=5                              ;;Timeout (in seconds) on the message stack, defaults to 5.
-                                        ;;Messages stored longer than this value will be deleted by Asterisk.
-                                        ;;This option applies to incoming messages only, which are intended to
-                                        ;;be processed by the JABBER_RECEIVE dialplan function.
+;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.
+;collection_nodes=yes			; Enable support for XEP-0248 for use with
+					; distributed device state.  Default is 'no'.
+;pubsub_autocreate=yes			; Whether or not the PubSub server supports/is using
+					; auto-create for nodes.  If it is, we have to
+					; explicitly pre-create nodes before publishing them.
+					; Default is 'no'.
+;auth_policy=accept			; Auto accept users' subscription requests (default).
+					; Set to deny for auto denial.
+;[asterisk]
+;type=client				; Client or Component connection
+;serverhost=astjab.org			; Route to server for example, talk.google.com
+;pubsub_node=pubsub.astjab.org		; Node to use for publishing events via PubSub
+;username=asterisk@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@astjab.org		; Manual addition of buddy to list.
+					; For distributed events, these buddies are
+					; automatically added in the whitelist as
+					; 'owners' of the node(s).
+;distribute_events=yes			; Whether or not to distribute events using
+					; this connection.  Default is 'no'.
+;status=available			; One of: chat, available, away, xaway, or dnd
+;statusmessage="I am available"		; Have custom status message for Asterisk
+;timeout=5				; Timeout (in seconds) on the message stack, defaults to 5.
+					; Messages stored longer than this value will be deleted by Asterisk.
+					; This option applies to incoming messages only, which are intended to
+					; be processed by the JABBER_RECEIVE dialplan function.
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 13c7bf2cd..9548dd800 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -4480,7 +4480,7 @@ static int aji_create_buddy(char *label, struct aji_client *client)
 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 };