[svn-commits] russell: branch 1.6.0 r117509 - in /branches/1.6.0: ./ main/ pbx/

[SVN commits to the Digium repositories]

Author: russell
Date: Wed May 21 13:20:34 2008
New Revision: 117509

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117509
Log:
Merged revisions 117508 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r117508 | russell | 2008-05-21 13:20:11 -0500 (Wed, 21 May 2008) | 15 lines

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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c
    branches/1.6.0/pbx/pbx_gtkconsole.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=117509&r1=117508&r2=117509
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Wed May 21 13:20:34 2008
@@ -967,6 +967,9 @@
 
 static void network_verboser(const char *s)
 {
+	if (*s == 127) {
+		s++;
+	}
 	ast_network_puts_mutable(s);
 }
 

Modified: branches/1.6.0/pbx/pbx_gtkconsole.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/pbx_gtkconsole.c?view=diff&rev=117509&r1=117508&r2=117509
==============================================================================
--- branches/1.6.0/pbx/pbx_gtkconsole.c (original)
+++ branches/1.6.0/pbx/pbx_gtkconsole.c Wed May 21 13:20:34 2008
@@ -132,6 +132,10 @@
 
 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);