From: Jason Parker Date: Thu, 12 Jul 2007 16:54:02 +0000 (+0000) Subject: Merged revisions 74866 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2072 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc5a034b76ddd0def24ec6cbd7564afb6555cd4;p=thirdparty%2Fasterisk.git Merged revisions 74866 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r74866 | qwell | 2007-07-12 11:53:35 -0500 (Thu, 12 Jul 2007) | 1 line It helps if I actually add this stuff for the 7921 too - otherwise it won't actually do much of anything. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74867 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index dfaeb7e394..9a122cc6f3 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1179,6 +1179,7 @@ static void *get_button_template(struct skinnysession *s, struct button_definiti (btn++)->buttonDefinition = BT_HOLD; break; case SKINNY_DEVICE_7920: + case SKINNY_DEVICE_7921: /* XXX I don't know if this is right. */ for (i = 0; i < 4; i++) (btn++)->buttonDefinition = BT_CUST_LINESPEEDDIAL; @@ -2074,6 +2075,8 @@ static char *device2str(int type) return "7961GE"; case SKINNY_DEVICE_7941GE: return "7941GE"; + case SKINNY_DEVICE_7921: + return "7921"; case SKINNY_DEVICE_7905: return "7905"; case SKINNY_DEVICE_7920: