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

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 66d2c87e7ece936116d6689205e43de764fe82dd..25928e7c7e318dbee88b4304eadc90d32e3f63e0 100644 (file)
--- 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[] = {