[Asterisk-cvs] asterisk/channels chan_mgcp.c,1.69,1.70

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv3205/channels

Modified Files:
	chan_mgcp.c 
Log Message:
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


Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- chan_mgcp.c	2 Aug 2004 04:32:37 -0000	1.69
+++ chan_mgcp.c	3 Aug 2004 06:31:20 -0000	1.70
@@ -2808,9 +2808,9 @@
             }
         } 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 @@
                 /* 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) {