[asterisk-commits] russell: branch 1.6.0 r167450 - in /branches/1.6.0: ./ main/indications.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jan  7 11:42:27 2009
New Revision: 167450

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

................
r167442 | russell | 2009-01-07 11:35:39 -0600 (Wed, 07 Jan 2009) | 12 lines

Merged revisions 167432 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r167432 | russell | 2009-01-07 11:29:53 -0600 (Wed, 07 Jan 2009) | 4 lines

Treat an empty string the same way as a NULL country argument.

In passing, simplify the handling of returning a default tone zone.

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/indications.c

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

Modified: branches/1.6.0/main/indications.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/indications.c?view=diff&rev=167450&r1=167449&r2=167450
==============================================================================
--- branches/1.6.0/main/indications.c (original)
+++ branches/1.6.0/main/indications.c Wed Jan  7 11:42:27 2009
@@ -383,11 +383,8 @@
 
 	AST_RWLIST_RDLOCK(&tone_zones);
 
-	if (!country) {
-		if (current_tonezone)
-			tz = current_tonezone;
-		else
-			tz = AST_LIST_FIRST(&tone_zones);
+	if (ast_strlen_zero(country)) {
+		tz = current_tonezone ? current_tonezone : AST_LIST_FIRST(&tone_zones);
 	} else {
 		do {
 			AST_RWLIST_TRAVERSE(&tone_zones, tz, list) {