[svn-commits] mmichelson: branch mmichelson/imap_consistency_trunk r136535 - in /team/mmich...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Aug  7 12:35:56 2008
New Revision: 136535

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136535
Log:
I lost automerge due to conflicts, so the automerge fairy left
a dollar under my pillow.

Little did she know that I can re-enable it with a flick of my
wrist. Mwahahahahaha...


Modified:
    team/mmichelson/imap_consistency_trunk/   (props changed)
    team/mmichelson/imap_consistency_trunk/apps/app_jack.c
    team/mmichelson/imap_consistency_trunk/apps/app_queue.c

Propchange: team/mmichelson/imap_consistency_trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/imap_consistency_trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/mmichelson/imap_consistency_trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/mmichelson/imap_consistency_trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug  7 12:35:56 2008
@@ -1,1 +1,1 @@
-/trunk:1-136425
+/trunk:1-136526

Modified: team/mmichelson/imap_consistency_trunk/apps/app_jack.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/imap_consistency_trunk/apps/app_jack.c?view=diff&rev=136535&r1=136534&r2=136535
==============================================================================
--- team/mmichelson/imap_consistency_trunk/apps/app_jack.c (original)
+++ team/mmichelson/imap_consistency_trunk/apps/app_jack.c Thu Aug  7 12:35:56 2008
@@ -859,7 +859,7 @@
 	if (init_jack_data(chan, jack_data))
 		goto return_error;
 
-	if (!(datastore = ast_channel_datastore_alloc(&jack_hook_ds_info, NULL)))
+	if (!(datastore = ast_datastore_alloc(&jack_hook_ds_info, NULL)))
 		goto return_error;
 
 	jack_data->has_audiohook = 1;
@@ -908,7 +908,7 @@
 	/* Keep the channel locked while we destroy the datastore, so that we can
 	 * ensure that all of the jack stuff is stopped just in case another frame
 	 * tries to come through the audiohook callback. */
-	ast_channel_datastore_free(datastore);
+	ast_datastore_free(datastore);
 
 	ast_channel_unlock(chan);
 

Modified: team/mmichelson/imap_consistency_trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/imap_consistency_trunk/apps/app_queue.c?view=diff&rev=136535&r1=136534&r2=136535
==============================================================================
--- team/mmichelson/imap_consistency_trunk/apps/app_queue.c (original)
+++ team/mmichelson/imap_consistency_trunk/apps/app_queue.c Thu Aug  7 12:35:56 2008
@@ -2234,6 +2234,7 @@
 		ast_verb(3, "Couldn't call %s\n", tmp->interface);
 		do_hang(tmp);
 		(*busies)++;
+		update_status(tmp->member->interface, ast_device_state(tmp->member->interface));
 		return 0;
 	} else if (qe->parent->eventwhencalled) {
 		char vars[2048];
@@ -2259,6 +2260,7 @@
 		ast_verb(3, "Called %s\n", tmp->interface);
 	}
 
+	update_status(tmp->member->interface, ast_device_state(tmp->member->interface));
 	return 1;
 }