From b5741f9dd4e38302ab7d62f3999c59f5b9011ac5 Mon Sep 17 00:00:00 2001 From: qwell Date: Mon, 23 Jul 2007 19:00:19 +0000 Subject: Merged revisions 76656 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r76656 | qwell | 2007-07-23 13:59:28 -0500 (Mon, 23 Jul 2007) | 3 lines Fix some incorrect softkey labels in messages. Don't try to play dialtone in some unimplemented features. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@76657 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_skinny.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'channels/chan_skinny.c') diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index cba099c63..3bf76e638 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3391,13 +3391,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: @@ -3458,7 +3456,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); @@ -4272,7 +4269,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: @@ -4381,8 +4377,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: @@ -4401,11 +4396,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) -- cgit v1.2.3