[asterisk-commits] bweschke: trunk r65455 - in /trunk: ./ apps/app_followme.c

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Tue May 22 10:25:28 2007
New Revision: 65455

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65455
Log:
Merged revisions 65408 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65408 | bweschke | 2007-05-22 10:02:56 -0400 (Tue, 22 May 2007) | 3 lines

 Fix a problem with flag recognition. 


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_followme.c

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

Modified: trunk/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_followme.c?view=diff&rev=65455&r1=65454&r2=65455
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Tue May 22 10:25:28 2007
@@ -981,13 +981,13 @@
 		}
 		ast_mutex_unlock(&f->lock);
 
-		if (targs.followmeflags.flags & FOLLOWMEFLAG_STATUSMSG) 
+		if (ast_test_flag(&targs.followmeflags, FOLLOWMEFLAG_STATUSMSG)) 
 			ast_stream_and_wait(chan, targs.statusprompt, "");
 
 		snprintf(namerecloc,sizeof(namerecloc),"%s/followme.%s",ast_config_AST_SPOOL_DIR,chan->uniqueid);
 		duration = 5;
 
-		if (targs.followmeflags.flags & FOLLOWMEFLAG_RECORDNAME) 
+		if (ast_test_flag(&targs.followmeflags, FOLLOWMEFLAG_RECORDNAME)) 
 			if (ast_play_and_record(chan, "vm-rec-name", namerecloc, 5, "sln", &duration, 128, 0, NULL) < 0)
 				goto outrun;
 
@@ -1021,7 +1021,7 @@
 
 		if (targs.status != 100) {
 			ast_moh_stop(chan);
-			if (targs.followmeflags.flags & FOLLOWMEFLAG_UNREACHABLEMSG) 
+			if (ast_test_flag(&targs.followmeflags, FOLLOWMEFLAG_UNREACHABLEMSG)) 
 				ast_stream_and_wait(chan, targs.sorryprompt, "");
 			res = 0;
 		} else {