[svn-commits] qwell: trunk r111721 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Mar 28 12:57:12 2008
New Revision: 111721

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111721
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

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

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=111721&r1=111720&r2=111721
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Fri Mar 28 12:57:12 2008
@@ -737,8 +737,8 @@
 	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 @@
 	SOFTKEY_ENDCALL,
 	SOFTKEY_CFWDALL,
 	SOFTKEY_CFWDBUSY,
-	SOFTKEY_GPICKUP,
+	/*SOFTKEY_GPICKUP,*/
 };
 
 static const uint8_t soft_key_default_connwithtrans[] = {