From c92ba70e75391bf9b7b55978eccd69f4f4f239e6 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 23 Jul 2007 18:59:28 +0000 Subject: [PATCH] Fix some incorrect softkey labels in messages. Don't try to play dialtone in some unimplemented features. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@76656 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_skinny.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 2804bcd53c..3c1530c64c 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3185,13 +3185,11 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession case STIMULUS_TRANSFER: if (skinnydebug) ast_verbose("Received Stimulus: Transfer(%d)\n", instance); - transmit_tone(s, SKINNY_DIALTONE); /* XXX figure out how to transfer */ break; case STIMULUS_CONFERENCE: if (skinnydebug) ast_verbose("Received Stimulus: Conference(%d)\n", instance); - transmit_tone(s, SKINNY_DIALTONE); /* XXX determine the best way to pull off a conference. Meetme? */ break; case STIMULUS_VOICEMAIL: @@ -3211,7 +3209,6 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession /* Because it's the same thing. */ /* Do not disturb */ - transmit_tone(s, SKINNY_DIALTONE); if (l->dnd != 0){ if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Disabling DND on %s@%s\n", l->name, d->name); @@ -3956,7 +3953,6 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse case SOFTKEY_TRNSFER: if (skinnydebug) ast_verbose("Received Softkey Event: Transfer(%d)\n", instance); - transmit_tone(s, SKINNY_DIALTONE); /* XXX figure out how to transfer */ break; case SOFTKEY_CFWDALL: @@ -4065,8 +4061,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse break; case SOFTKEY_CONFRN: if (skinnydebug) - ast_verbose("Received Softkey Event: Transfer(%d)\n", instance); - transmit_tone(s, SKINNY_DIALTONE); + ast_verbose("Received Softkey Event: Conference(%d)\n", instance); /* XXX determine the best way to pull off a conference. Meetme? */ break; case SOFTKEY_PARK: @@ -4085,11 +4080,11 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse break; case SOFTKEY_PICKUP: if (skinnydebug) - ast_verbose("Received Softkey Event: None(%d)\n", instance); + ast_verbose("Received Softkey Event: Pickup(%d)\n", instance); break; case SOFTKEY_GPICKUP: if (skinnydebug) - ast_verbose("Received Softkey Event: Group Pickup (%d)\n", instance); + ast_verbose("Received Softkey Event: Group Pickup(%d)\n", instance); break; default: if (skinnydebug)