Merged revisions 117507 via svnmerge from

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

........
r117507 | russell | 2008-05-21 13:19:34 -0500 (Wed, 21 May 2008) | 7 lines

1) Don't print the verbose marker in front of every message from ast_verbose()
   being sent to remote consoles.

2) Fix pbx_gtkconsole to filter out the verbose marker.

(related to issue #12702)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117508 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/asterisk.c b/main/asterisk.c
index c8a4b2655e8fa2c38c0db4ed2c9774bbe94400e5..58497fe0dfca414c65eaae6118801c6a5a4dc289 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -964,6 +964,9 @@ void ast_console_puts(const char *string)
 
 static void network_verboser(const char *s)
 {
+       if (*s == 127) {
+               s++;
+       }
        ast_network_puts_mutable(s);
 }
 

diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index 5e47ac668105846ca518be0fbc993283028c7271..a12e139bbd82e42de84e9af1d9b3d026a4235485 100644 (file)
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -132,6 +132,10 @@ static void __verboser(const char *_stuff)
 
 static void verboser(const char *stuff) 
 {
+       if (*stuff == 127) {
+               stuff++;
+       }
+
        ast_mutex_lock(&verb_lock);
        /* Lock appropriately if we're really being called in verbose mode */
        __verboser(stuff);