[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "transfer" updated.

[Commits to the Asterisk SCF project code repositories]

branch "transfer" has been updated
       via  ce69a3d44dd548559cc9745648839fd66add4369 (commit)
      from  517b96aa623d769f08db846acf6ff3d33f3e5127 (commit)

Summary of changes:
 src/SipSession.cpp |    5 ++++-
 src/SipSession.h   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit ce69a3d44dd548559cc9745648839fd66add4369
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Oct 12 09:58:06 2010 -0300

    Update to latest version of slice.

diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 71a2514..becb24d 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -298,10 +298,13 @@ AsteriskSCF::SessionCommunications::V1::BridgePrx SipSession::getBridge(const Ic
 /**
  * An implementation of the setBridge method as defined in SessionCommunications.ice
  */
-void SipSession::setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge, const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current& current)
+AsteriskSCF::SessionCommunications::V1::SessionInfoPtr SipSession::setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge,
+									     const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+									     const Ice::Current& current)
 {
    mImplPriv->mBridge = bridge;
    addListener(listener, current);
+   return getInfo(current);
 }
 
 /**
diff --git a/src/SipSession.h b/src/SipSession.h
index d0af06e..5703f0e 100644
--- a/src/SipSession.h
+++ b/src/SipSession.h
@@ -74,7 +74,7 @@ public:
    AsteriskSCF::SessionCommunications::V1::SessionInfoPtr getInfo(const Ice::Current&);
    AsteriskSCF::Media::V1::SessionPrx getMediaSession(const Ice::Current&);
    AsteriskSCF::SessionCommunications::V1::BridgePrx getBridge(const Ice::Current&);
-   void setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx&, const Ice::Current&);
+   AsteriskSCF::SessionCommunications::V1::SessionInfoPtr setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx&, const Ice::Current&);
    void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx&, const Ice::Current&);
    void hold(const Ice::Current&);
    void progress(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&);

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git