use an improved dump_packet() to simplify send(packet) logging

git-svn-id: https://xpra.org/svn/Xpra/trunk@309 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/protocol.py

@@ -60,7 +60,7 @@ def repr_ellipsized(obj, limit=100):
         return repr(obj)
 
 def dump_packet(packet):
-    return "[" + ", ".join([repr_ellipsized(x, 50) for x in packet]) + "]"
+    return "[" + ", ".join([repr_ellipsized(str(x), 50) for x in packet]) + "]"
 
 def main_thread_call(fn, *args, **kwargs):
     log("Queueing main thread call to %s" % (fn,))

src/xpra/server.py

@@ -55,7 +55,7 @@ def logp2(x):
 log = Logger()
 
 import xpra
-from xpra.protocol import Protocol, SocketConnection
+from xpra.protocol import Protocol, SocketConnection, dump_packet
 from xpra.keys import mask_to_names
 from xpra.xposix.xclipboard import ClipboardProtocolHelper
 from xpra.xposix.xsettings import XSettingsManager
@@ -786,7 +786,7 @@ def do_wimpiggy_cursor_event(self, event):
         self.send_cursor()
 
     def send_cursor(self):
-        self._send(["cursor", self.cursor_image or ""], "cursor")
+        self._send(["cursor", self.cursor_image or ""])
 
     def _bell_signaled(self, wm, event):
         log("_bell_signaled(%s,%r)" % (wm, event))
@@ -1024,12 +1024,9 @@ def _move_pointer(self, pos):
         display = gtk.gdk.display_get_default()
         display.warp_pointer(display.get_default_screen(), x, y)
 
-    def _send(self, packet, packetlog=None):
+    def _send(self, packet):
         if self._protocol is not None:
-            if packetlog:
-                log("Queuing packet: %s", packetlog)
-            else:
-                log("Queuing packet: %s", packet)
+            log("Queuing packet: %s", dump_packet(packet))
             self._protocol.source.queue_ordinary_packet(packet)
 
     def _raw_send(self, proto, packet):