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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@289704 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/jabber.conf.sample b/configs/jabber.conf.sample
index 6cfb755bde795f60f09dd261334eabd25ff19586..4e815ef8318d5240ff89e7c4faf5a24e13d66832 100644 (file)
--- a/configs/jabber.conf.sample
+++ b/configs/jabber.conf.sample
@@ -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@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.
-;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@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.
+;statusmessage="I am available"                ; Have custom status message for Asterisk
+;timeout=100                           ; Timeout on the message stack.

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 7912f88ba7081e1e92a7e26d5efd7026de0d2e31..68758868abde359e1c0187d8e327117100705488 100644 (file)
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -2897,7 +2897,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 };