summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2008-03-28 17:57:12 +0000
committerJason Parker <jparker@digium.com>2008-03-28 17:57:12 +0000
commit5591c696a5a85aa82924cdf3c22ceb0cd38d8a5d (patch)
tree0c4f9fdc90536b808b5f0104bec22beba570cd3b /channels
parentca8e44c051cba9dd3d973fd37b16ee76e2fa59cb (diff)
Merged revisions 111720 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111720 | qwell | 2008-03-28 12:55:05 -0500 (Fri, 28 Mar 2008) | 1 line Remove unimplemented softkeys. Prompted by issue #12325. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_skinny.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 66d2c87e7..25928e7c7 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -737,8 +737,8 @@ static const uint8_t soft_key_default_onhook[] = {
SOFTKEY_CFWDALL,
SOFTKEY_CFWDBUSY,
SOFTKEY_DND,
- SOFTKEY_GPICKUP,
- SOFTKEY_CONFRN,
+ /*SOFTKEY_GPICKUP,
+ SOFTKEY_CONFRN,*/
};
static const uint8_t soft_key_default_connected[] = {
@@ -768,7 +768,7 @@ static const uint8_t soft_key_default_offhook[] = {
SOFTKEY_ENDCALL,
SOFTKEY_CFWDALL,
SOFTKEY_CFWDBUSY,
- SOFTKEY_GPICKUP,
+ /*SOFTKEY_GPICKUP,*/
};
static const uint8_t soft_key_default_connwithtrans[] = {