[svn-commits] oej: branch oej/managerstuff r46458 - in /team/oej/managerstuff: ./ apps/ con...

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Oct 30 11:29:32 2006
New Revision: 46458

URL: http://svn.digium.com/view/asterisk?rev=46458&view=rev
Log:
Reset

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/apps/app_queue.c
    team/oej/managerstuff/configs/indications.conf.sample

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 30 11:29:32 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-34937
+/branches/1.2:1-7496,7498-36077

Modified: team/oej/managerstuff/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_queue.c?rev=46458&r1=46457&r2=46458&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_queue.c (original)
+++ team/oej/managerstuff/apps/app_queue.c Mon Oct 30 11:29:32 2006
@@ -3697,8 +3697,10 @@
 			else
 				ast_log(LOG_DEBUG, "XXX Leaking a little memory :( XXX\n");
 		} else {
+			ast_mutex_lock(&q->lock);
 			for (cur = q->members; cur; cur = cur->next)
 				cur->status = ast_device_state(cur->interface);
+			ast_mutex_unlock(&q->lock);
 		}
 	}
 	AST_LIST_TRAVERSE_SAFE_END;

Modified: team/oej/managerstuff/configs/indications.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/configs/indications.conf.sample?rev=46458&r1=46457&r2=46458&view=diff
==============================================================================
--- team/oej/managerstuff/configs/indications.conf.sample (original)
+++ team/oej/managerstuff/configs/indications.conf.sample Mon Oct 30 11:29:32 2006
@@ -585,6 +585,21 @@
 info = !950/330,!1400/330,!1800/330,0
 stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
 
+[ve]
+; Tone definition source for ve found on 
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+description = Venezuela / South America
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 400+450/300,0/6000
+dialrecall = 425
+record = 1400/500,0/15000
+info = !950/330,!1440/330,!1800/330,0/1000
+
+
 [za]
 description = South Africa
 ; http://www.cisco.com/univercd/cc/td/doc/product/tel_pswt/vco_prod/safr_sup/saf02.htm