Changeset 8559 for branches/jingle

Timestamp:

08/24/07 15:25:12 (16 months ago)

Author:

liori

Message:

Jingle: declining session

Files:

• branches/jingle/src/common/jingle.py (modified) (4 diffs)

branches/jingle/src/common/jingle.py

@@ -79 +79 @@
                         'session-info':         [self.__defaultCB],
                         'session-initiate':     [self.__sessionInitiateCB, self.__broadcastCB, self.__defaultCB],
-                        'session-terminate':    [self.__defaultCB],
+                        'session-terminate':    [self.__broadcastAllCB, self.__defaultCB],
                         'transport-info':       [self.__broadcastCB, self.__defaultCB],
                         'iq-result':            [],
@@ -137 +137 @@
                     all(c.negotiated for c in self.contents.itervalues()):
                         self.__sessionAccept()
-                else:
         ''' Middle-level function to do stanza exchange. '''
         def startSession(self):
@@ -233 +232 @@
                         cn.stanzaCB(stanza, content, error, action)
 
+        def __broadcastAllCB(self, stanza, jingle, error, action):
+                ''' Broadcast the stanza to all content handlers. '''
+                for content in self.contents.itervalues():
+                        content.stanzaCB(stanza, None, error, action)
+
         def on_p2psession_error(self, *anything): pass
 
@@ -286 +290 @@
                 assert self.state!=JingleStates.ended
                 stanza, jingle = self.__makeJingle('session-terminate')
+                self.__broadcastAllCB(stanza, jingle, None, 'session-terminate-sent')
                 self.connection.connection.send(stanza)
-                self.__broadcastCB(stanza, jingle, None, 'session-terminate-sent')
 
         def __contentAdd(self):