[svn-commits] bbryant: branch 1.6.0 r132509 - in /branches/1.6.0: ./ apps/app_sendtext.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Mon Jul 21 15:55:22 2008
New Revision: 132509

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

........
r132508 | bbryant | 2008-07-21 15:54:09 -0500 (Mon, 21 Jul 2008) | 9 lines

Fix a bug where SENDTEXTSTATUS isn't set properly when it isn't 
supported on a channel (yet _another_ useful patch by eliel).

(closes issue #13081)
Reported by: eliel
Patches:
      app_sendtext.c.patch uploaded by eliel (license 64)
Tested by: eliel

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_sendtext.c

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

Modified: branches/1.6.0/apps/app_sendtext.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_sendtext.c?view=diff&rev=132509&r1=132508&r2=132509
==============================================================================
--- branches/1.6.0/apps/app_sendtext.c (original)
+++ branches/1.6.0/apps/app_sendtext.c Mon Jul 21 15:55:22 2008
@@ -42,7 +42,7 @@
 static const char *synopsis = "Send a Text Message";
 
 static const char *descrip = 
-"  SendText(text[,options]): Sends text to current channel (callee).\n"
+"  SendText(text): Sends text to current channel (callee).\n"
 "Result of transmission will be stored in the SENDTEXTSTATUS\n"
 "channel variable:\n"
 "      SUCCESS      Transmission succeeded\n"
@@ -58,24 +58,21 @@
 	char *parse = NULL;
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(text);
-		AST_APP_ARG(options);
 	);
 
 	if (ast_strlen_zero(data)) {
-		ast_log(LOG_WARNING, "SendText requires an argument (text[,options])\n");
+		ast_log(LOG_WARNING, "SendText requires an argument (text)\n");
 		return -1;
 	} else
 		parse = ast_strdupa(data);
 	
 	AST_STANDARD_APP_ARGS(args, parse);
 
-	if (args.options) {
-	}
-
 	ast_channel_lock(chan);
 	if (!chan->tech->send_text) {
 		ast_channel_unlock(chan);
 		/* Does not support transport */
+		pbx_builtin_setvar_helper(chan, "SENDTEXTSTATUS", status);
 		return 0;
 	}
 	status = "FAILURE";