diff options
| author | Jefry Lagrange <jefry.reyes@gmail.com> | 2011-07-15 03:07:14 +0400 |
|---|---|---|
| committer | Jefry Lagrange <jefry.reyes@gmail.com> | 2011-07-15 03:07:14 +0400 |
| commit | c0e4756f12b80203dab429e593d864022a04dd2b (patch) | |
| tree | e1cbd8c1359a530c69e68f4b02c50e3defe263d6 | |
| parent | 27649a64aa2638c08942ce5d6cb5bf66aea76e14 (diff) | |
fixed session-accept
| -rw-r--r-- | src/common/jingle_session.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py index 2a6cb8669..8f96b54a1 100644 --- a/src/common/jingle_session.py +++ b/src/common/jingle_session.py @@ -385,7 +385,7 @@ class JingleSession(object): transport = JingleTransportIBB() self.modify_content(creator, name, transport) - #self.state = JingleStates.pending + self.state = JingleStates.pending self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE self.__ack(stanza, jingle, error, action) self.__session_accept() @@ -627,14 +627,12 @@ class JingleSession(object): return (reason, text) def __make_jingle(self, action, reason=None): - stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid)) + stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid), + frm=self.responder) attrs = {'action': action, 'sid': self.sid} - if action == 'session-initiate': - attrs['initiator'] = self.initiator - elif action == 'session-accept': - attrs['responder'] = self.responder - elif action == 'transport-replace': + if action == 'session-initiate' or action == 'session-accept' or \ + action == 'transport-replace': attrs['initiator'] = self.initiator jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) if reason is not None: |