Changeset 1150 in xpra

Timestamp:

07/23/12 10:42:45 (10 months ago)

Author:

antoine

Message:

r1032 for 0.3.x branch: handle gibberish in main thread

File:

• tags/v0.3.x/src/xpra/protocol.py (modified) (2 diffs)

tags/v0.3.x/src/xpra/protocol.py

@@ -450 +450 @@
                         packet_index = 0
                         continue
+                    result = None
                     try:
                         #final packet (packet_index==0), decode it:
@@ -459 +460 @@
                         if self._closed:
                             return
-                        # Peek at the data we got, in case we can make sense of it:
-                        self._process_packet([Protocol.GIBBERISH, buf])
-                        # Then hang up:
-                        return self._connection_lost("gibberish received: %s, packet index=%s, packet size=%s, buffer size=%s, error=%s" % (repr_ellipsized(read_buffer), packet_index, current_packet_size, bl, e))
+                        def gibberish(buf):
+                            # Peek at the data we got, in case we can make sense of it:
+                            self._process_packet([Protocol.GIBBERISH, buf])
+                            # Then hang up:
+                            return self._connection_lost("gibberish received: %s, packet index=%s, packet size=%s, buffer size=%s, error=%s" % (repr_ellipsized(raw_string), packet_index, current_packet_size, bl, e))
+                        gobject.idle_add(gibberish, raw_string)
+                        return
 
                     current_packet_size = -1