[asterisk-commits] mnicholson: trunk r333117 - in /trunk: ./ res/res_fax.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Aug 24 11:52:56 2011
New Revision: 333117

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333117
Log:
Merged revisions 333115 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r333115 | mnicholson | 2011-08-24 11:51:42 -0500 (Wed, 24 Aug 2011) | 4 lines
  
  Changed the "timeout" option to "gwtimeout".
  
  ASTERISK-18219
........

Modified:
    trunk/   (props changed)
    trunk/res/res_fax.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=333117&r1=333116&r2=333117
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Wed Aug 24 11:52:56 2011
@@ -192,7 +192,7 @@
 					<enum name="gateway">
 						<para>R/W T38 Gateway Enabled (yes/no)</para>
 					</enum>
-					<enum name="timeout">
+					<enum name="gwtimeout">
 						<para>R/W Gateway fax activity timeout in seconds (yes/no/seconds)</para>
 					</enum>
 					<enum name="pages">
@@ -3472,7 +3472,7 @@
 	} else if (!strcasecmp(data, "t38gateway") || !strcasecmp(data, "gateway") ||
 		   !strcasecmp(data, "t38_gateway") || !strcasecmp(data, "faxgateway")) {
 		ast_copy_string(buf, details->gateway_id != -1 ? "yes" : "no", len);
-	} else if (!strcasecmp(data, "timeout")) {
+	} else if (!strcasecmp(data, "gwtimeout")) {
 		snprintf(buf, len, "%d", details->gateway_timeout / 1000);
 	} else if (!strcasecmp(data, "error")) {
 		ast_copy_string(buf, details->error, len);
@@ -3569,7 +3569,7 @@
 		} else {
 			ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);
 		}
-	} else if (!strcasecmp(data, "timeout")) {
+	} else if (!strcasecmp(data, "gwtimeout")) {
 		const char *val = ast_skip_blanks(value);
 		int timeout;
 		if (ast_true(val)) {