[svn-commits] russell: branch russell/readq-1.4 r88674 - in /team/russell/readq-1.4: ./ cha...

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Nov  5 13:00:52 2007
New Revision: 88674

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88674
Log:
resolve, reset

Modified:
    team/russell/readq-1.4/   (props changed)
    team/russell/readq-1.4/channels/chan_sip.c
    team/russell/readq-1.4/main/channel.c

Propchange: team/russell/readq-1.4/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/readq-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov  5 13:00:52 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-88588
+/branches/1.4:1-88673

Modified: team/russell/readq-1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/readq-1.4/channels/chan_sip.c?view=diff&rev=88674&r1=88673&r2=88674
==============================================================================
--- team/russell/readq-1.4/channels/chan_sip.c (original)
+++ team/russell/readq-1.4/channels/chan_sip.c Mon Nov  5 13:00:52 2007
@@ -4847,7 +4847,7 @@
 /*! \brief Change hold state for a call */
 static void change_hold_state(struct sip_pvt *dialog, struct sip_request *req, int holdstate, int sendonly)
 {
-	if (global_notifyhold)
+	if (global_notifyhold && (!holdstate || !ast_test_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD)))
 		sip_peer_hold(dialog, holdstate);
 	if (global_callevents)
 		manager_event(EVENT_FLAG_CALL, holdstate ? "Hold" : "Unhold",

Modified: team/russell/readq-1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/readq-1.4/main/channel.c?view=diff&rev=88674&r1=88673&r2=88674
==============================================================================
--- team/russell/readq-1.4/main/channel.c (original)
+++ team/russell/readq-1.4/main/channel.c Mon Nov  5 13:00:52 2007
@@ -3788,7 +3788,7 @@
 	}
 
 	/* Move data stores over */
-	if (!AST_LIST_EMPTY(&clone->datastores))
+	if (AST_LIST_FIRST(&clone->datastores))
 		AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry);
 
 	clone_variables(original, clone);