Tilghman Lesher e921e6f0de Merged revisions 130889 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130889 | tilghman | 2008-07-14 18:59:13 -0500 (Mon, 14 Jul 2008) | 8 lines

Override the callerid in all cases when the callerid is set in the user, not
just when a remote callerid is set.  Also, if not set in the user, allow the
remote CallerID to pass through.
(closes issue #12875)
 Reported by: dimas
 Patches: 
       20080714__bug12875.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@130890 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-07-14 23:59:54 +00:00

..

h323

Swap "static" and "const", so that "static" appears at the beginning of each

2008-07-14 15:44:07 +00:00

misdn

Swap "static" and "const", so that "static" appears at the beginning of each

2008-07-14 15:44:07 +00:00

xpmr

Compile under dev-mode, please.

2008-05-16 17:08:59 +00:00

chan_agent.c

Unlock list before returning

2008-07-13 02:34:32 +00:00

chan_alsa.c

Merged revisions 118953 via svnmerge from

2008-05-29 17:35:19 +00:00

chan_console.c

This was accidentally reverted.

2008-06-08 01:41:59 +00:00

chan_dahdi.c

Support new TRANSPORT definitions in libss7

2008-07-11 21:36:26 +00:00

chan_features.c

More expansion of the deadlock avoidance macro, including a macro to do locking

2008-06-25 02:34:11 +00:00

chan_gtalk.c

Janitor patch to change uses of sizeof to ARRAY_LEN

2008-07-11 18:09:35 +00:00

chan_h323.c

More expansion of the deadlock avoidance macro, including a macro to do locking

2008-06-25 02:34:11 +00:00

chan_iax2.c

Merged revisions 130889 via svnmerge from

2008-07-14 23:59:54 +00:00

chan_jingle.c

Janitor patch to change uses of sizeof to ARRAY_LEN

2008-07-11 18:09:35 +00:00

chan_local.c

Revert half of the fix, as this part may have been unnecessary (related to issue #12914)

2008-06-27 16:00:05 +00:00

chan_mgcp.c

Merged revisions 123113 via svnmerge from

2008-06-16 19:57:05 +00:00

chan_misdn.c

oops

2008-05-22 17:08:18 +00:00

chan_nbs.c

one more place I forgot

2008-05-22 17:50:40 +00:00

chan_oss.c

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

chan_phone.c

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_phone.h

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_sip.c

Missed one. Formatting only.

2008-07-11 18:32:26 +00:00

chan_skinny.c

Convert chan_skinny's open-coded linked lists to the list macros

2008-07-13 22:59:35 +00:00

chan_unistim.c

Swap "static" and "const", so that "static" appears at the beginning of each

2008-07-14 15:44:07 +00:00

chan_usbradio.c

Split the compile flags out and wire up some dependencies

2008-05-22 21:43:54 +00:00

chan_vpb.cc

Fix trunk breakage

2008-05-22 21:27:00 +00:00

console_board.c

import the recent additions for video console into trunk,

2008-06-29 21:17:14 +00:00

console_gui.c

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

console_video.c

use ast_pthread_create_detached_background() instead of redoing

2008-07-14 16:50:24 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

iax2-parser.c

Fix one more file that got changed.

2008-07-03 22:47:48 +00:00

iax2-parser.h

Improve native transfers when a chain of IAX2 connections are in use.

2008-05-17 19:39:35 +00:00

iax2-provision.c

Janitor project to convert sizeof to ARRAY_LEN macro.

2008-07-08 16:40:28 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Remove commit that somehow got mergeed into trunk.

2008-07-03 22:44:39 +00:00

Makefile

Bring all app_rpt and chan_usbradio stuff up to date

2008-05-16 00:51:14 +00:00

misdn_config.c

Oops, missed one

2008-03-26 20:34:05 +00:00

vcodecs.c

make this compile after ast_frame's data field changed to a union

2008-06-29 12:45:59 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

2008-07-14 16:50:54 +00:00