Changeset 8632 for branches/gajim_0.11.1/src/common

Timestamp:

08/30/07 22:35:52 (15 months ago)

Author:

roidelapluie

Message:

add a now argument to the send function, so that stanza is sent
instantly instead of added to queue. Use it to send answer to adhoc
command when we disconnect. fixes #3008 and #2808

Location:

branches/gajim_0.11.1/src/common

Files:

• commands.py (modified) (1 diff)
• xmpp/dispatcher_nb.py (modified) (2 diffs)
• xmpp/transports_nb.py (modified) (2 diffs)

branches/gajim_0.11.1/src/common/commands.py

@@ -136 +136 @@
                 # if going offline, we need to push response so it won't go into
                 # queue and disappear
-                self.connection.connection.send(response, presencetype == 'offline')
+                self.connection.connection.send(response, now = presencetype == 'offline')
 
                 # send new status

branches/gajim_0.11.1/src/common/xmpp/dispatcher_nb.py

@@ -400 +400 @@
                 self.SendAndWaitForResponse(stanza, 0, func, args)
         
-        def send(self, stanza, is_message = False):
+        def send(self, stanza, is_message = False, now = False):
                 ''' Serialise stanza and put it on the wire. Assign an unique ID to it before send.
                         Returns assigned ID.'''
                 if type(stanza) in [type(''), type(u'')]: 
-                        return self._owner.Connection.send(stanza)
+                        return self._owner.Connection.send(stanza, now = now)
                 if not isinstance(stanza, Protocol): 
                         _ID=None
@@ -428 +428 @@
                 stanza.setParent(self._metastream)
                 if is_message:
-                        self._owner.Connection.send(stanza, True)
+                        self._owner.Connection.send(stanza, True, now = now)
                 else:
-                        self._owner.Connection.send(stanza)
+                        self._owner.Connection.send(stanza, now = now)
                 return _ID
         

branches/gajim_0.11.1/src/common/xmpp/transports_nb.py

@@ -326 +326 @@
                 return True
 
-        def send(self, raw_data):
+        def send(self, raw_data, now = False):
                 '''Append raw_data to the queue of messages to be send. 
                 If supplied data is unicode string, encode it to utf-8.
@@ -337 +337 @@
                 elif not isinstance(r, str): 
                         r = ustr(r).encode('utf-8')
-                self.sendqueue.append(r)
+                if now:
+                        self.sendqueue.insert(0, r)
+                        self._do_send()
+                else:
+                        self.sendqueue.append(r)
                 self._plug_idle()