From 7f9ffd64145a44ac7701f5bfd130cb19d0be39a6 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Sun, 06 Feb 2011 16:26:58 +0000
Subject: reworking of arguments used in sharing pixbufs

---
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index a4dbb64..f600228 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -512,10 +512,9 @@ class TurtleGraphics:
             colorspace = pixbuf.get_colorspace()
             event = "P|%s" % (data_to_string([self._get_my_nick(),
                 [round_int(a), round_int(b), round_int(x), round_int(y),
-                 round_int(w), round_int(h), path,
-                 height, width, stride, bits_per_sample,
-                 has_alpha, colorspace,
-                 base64.standard_b64encode(str(data))]]))
+                 round_int(w), round_int(h),
+                 width, height, stride, bits_per_sample,
+                 has_alpha, colorspace, data]]))
             self._send_event(event, share)
 
     def draw_text(self, label, x, y, size, w, share=True):
diff --git a/TurtleArt/tacollaboration.py b/TurtleArt/tacollaboration.py
index 6fe8705..2b1c074 100644
--- a/TurtleArt/tacollaboration.py
+++ b/TurtleArt/tacollaboration.py
@@ -225,14 +225,13 @@ class Collaboration():
     
     def _draw_pixbuf(self, payload):
         if len(payload) > 0:
-            [nick, [a, b, x, y, w, h, path, width, height, stride,
+            [nick, [a, b, x, y, w, h, width, height, stride,
                     bits_per_sample, has_alpha, colorspace, data]] =\
                     data_from_string(payload)
             if nick != self._tw.nick:
                 self._tw.canvas.draw_pixbuf(gtk.gdk.pixbuf_new_from_data(
-                    base64.standard_b64decode(data), colorspace, has_alpha,
-                    bits_per_sample, width, height, stride), a, b, x, y, w,
-                                            h, path, False)
+                    data, colorspace, has_alpha, bits_per_sample, width,
+                    height, stride), a, b, x, y, w, h, None, False)
 
     def _move_forward(self, payload):
         if len(payload) > 0:
--
cgit v0.9.1