[asterisk-commits] murf: trunk r51684 - in /trunk: ./ main/callerid.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Jan 23 13:11:53 2007
New Revision: 51684

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

........
r51683 | murf | 2007-01-23 11:58:27 -0700 (Tue, 23 Jan 2007) | 1 line

via 8748 (callerid.c loses name when returning PRIVATE_NUMBER flag), the user suggested this mod, saying it would allow 'WITHHELD' to appear in the name field, which would be useful
........

Modified:
    trunk/   (props changed)
    trunk/main/callerid.c

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

Modified: trunk/main/callerid.c
URL: http://svn.digium.com/view/asterisk/trunk/main/callerid.c?view=diff&rev=51684&r1=51683&r2=51684
==============================================================================
--- trunk/main/callerid.c (original)
+++ trunk/main/callerid.c Tue Jan 23 13:11:53 2007
@@ -161,7 +161,7 @@
 void callerid_get(struct callerid_state *cid, char **name, char **number, int *flags)
 {
 	*flags = cid->flags;
-	if (cid->flags & (CID_UNKNOWN_NAME | CID_PRIVATE_NUMBER))
+	if (cid->flags & (CID_UNKNOWN_NAME | CID_PRIVATE_NAME))
 		*name = NULL;
 	else
 		*name = cid->name;