From f3522b6c011f1dedba1524034c52476269697bab Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 3 Aug 2004 06:31:20 +0000 Subject: Plane commits (a.k.a. the Delta deltas): 1) Make muted reconnect 2) Add "X" option to meetme and add ${MEETME_EXIT_CONTEXT}, 3) Allow SIP call parking with supervised transfer, 4) Only create parking entries when calls actually get parked, 5) Add "sunshine" song, 6) Update hardware documentation, 7) Don't load empty strings from history file git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3572 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_mgcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'channels') diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 8adeede3c..f30e4ab4a 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -2808,9 +2808,9 @@ static void handle_hd_hf(struct mgcp_subchannel *sub, char *ev) } } else { if (p->hookstate == MGCP_OFFHOOK) { - ast_log(LOG_WARNING, "Off hook, but alreaedy have owner on %s@%s\n", p->name, p->parent->name); + ast_log(LOG_WARNING, "Off hook, but already have owner on %s@%s\n", p->name, p->parent->name); } else { - ast_log(LOG_WARNING, "On hook, but alreaedy have owner on %s@%s\n", p->name, p->parent->name); + ast_log(LOG_WARNING, "On hook, but already have owner on %s@%s\n", p->name, p->parent->name); ast_log(LOG_WARNING, "If we're onhook why are we here trying to handle a hd or hf?"); } if (sub->owner->bridge) { @@ -2921,8 +2921,8 @@ static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, /* Thanks to point on IRC for pointing this out */ return -1; } - /* do not let * confrnce two down channels */ - if( sub->owner && sub->owner->_state == AST_STATE_DOWN && !sub->next->owner) return -1; + /* do not let * confrnce two down channels */ + if( sub->owner && sub->owner->_state == AST_STATE_DOWN && !sub->next->owner) return -1; if (p->callwaiting || p->transfer || p->threewaycalling) { if (option_verbose > 2) { -- cgit v1.2.3