diff options
| author | Olle Johansson <oej@edvina.net> | 2007-11-25 11:10:52 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2007-11-25 11:10:52 +0000 |
| commit | 77e15c9b2fd956ab765b97345792fa4db68fdd79 (patch) | |
| tree | 177a495066e24731c94eb491dd00e8ff650c424e /include | |
| parent | a63f6be669bbe79db05bd9994245650502d439bc (diff) | |
Housekeeping...
- Fix typo in chan_sip
- Remove changes to caller ID structure, moving it to branch (russellb)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 812c01a43..68206f6a3 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -207,9 +207,6 @@ struct ast_datastore { * SIP and IAX2 has utf8 encoded Unicode caller ID names. * In some cases, we also have an alternative (RPID) E.164 number that can be used * as caller ID on numeric E.164 phone networks (zaptel or SIP/IAX2 to pstn gateway). - - * SIP and IAX2 will prefer the cid_utf8 if it exists, otherwise use the cid_name. - * \todo Implement this in chan_sip.c and chan_iax2.c * * \todo Implement settings for transliteration between UTF8 caller ID names in * to Ascii Caller ID's (Zaptel). Östen Åsklund might be transliterated into @@ -223,9 +220,6 @@ struct ast_callerid { char *cid_name; /*!< Malloc'd Caller Name (ASCII) */ char *cid_ani; /*!< Malloc'd ANI */ char *cid_rdnis; /*!< Malloc'd RDNIS */ - char *cid_utf8; /*!< Malloc'd Caller ID name in utf8 */ - char *cid_domain; /*!< Malloc'd Caller ID domain (ascii. IDN supported) */ - char *cid_e164; /*!< Malloc'd Alternative Caller ID E.164 (alternative to SIP/IAX2 utf8 uri, RPID) */ int cid_pres; /*!< Callerid presentation/screening */ int cid_ani2; /*!< Callerid ANI 2 (Info digits) */ int cid_ton; /*!< Callerid Type of Number */ |