Merge branch 'master' of git.sugarlabs.org:yupana/yupana

13 files changed, 372 insertions, 336 deletions

diff --git a/NEWS b/NEWS
index 337af54..694e5a1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+7
+
+ENHANCEMENTS:
+* Ignacio Rodriguez port to gtk3
+
 5
 
 BUG FIX:
diff --git a/YupanaActivity.py b/YupanaActivity.py
index d065ec3..591426a 100644
--- a/YupanaActivity.py
+++ b/YupanaActivity.py
@@ -1,4 +1,5 @@
-#Copyright (c) 2011 Walter Bender
+#Copyright (c) 2011,12 Walter Bender
+#Copyright (c) 2012 Ignacio Rodriguez
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,21 +10,14 @@
 # along with this library; if not, write to the Free Software
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
+from gi.repository import Gtk, Gdk, GObject
 
-import gtk
-
-from sugar.activity import activity
-from sugar import profile
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox
-    _have_toolbox = True
-except ImportError:
-    _have_toolbox = False
-
-if _have_toolbox:
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarButton
+from sugar3.activity import activity
+from sugar3 import profile
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbarbox import ToolbarButton
 
 from toolbar_utils import button_factory, label_factory, separator_factory, \
     radio_factory, entry_factory
@@ -33,8 +27,8 @@ import telepathy
 import dbus
 from dbus.service import signal
 from dbus.gobject_service import ExportedGObject
-from sugar.presence import presenceservice
-from sugar.presence.tubeconn import TubeConnection
+from sugar3.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
 
 from gettext import gettext as _
 
@@ -66,13 +60,13 @@ class YupanaActivity(activity.Activity):
         else:
             self.colors = ['#A0FFA0', '#FF8080']
 
-        self._setup_toolbars(_have_toolbox)
+        self._setup_toolbars()
         self._setup_dispatch_table()
 
         # Create a canvas
-        canvas = gtk.DrawingArea()
-        canvas.set_size_request(gtk.gdk.screen_width(), \
-                                gtk.gdk.screen_height())
+        canvas = Gtk.DrawingArea()
+        canvas.set_size_request(Gdk.Screen.width(), \
+                                Gdk.Screen.height())
         self.set_canvas(canvas)
         canvas.show()
         self.show_all()
@@ -89,56 +83,44 @@ class YupanaActivity(activity.Activity):
         if self._reload_custom:
             self._custom_cb()
 
-    def _setup_toolbars(self, have_toolbox):
+    def _setup_toolbars(self):
         """ Setup the toolbars. """
 
         self.max_participants = 4
 
-        yupana_toolbar = gtk.Toolbar()
-        self.custom_toolbar = gtk.Toolbar()
-        if have_toolbox:
-            toolbox = ToolbarBox()
+        yupana_toolbar = Gtk.Toolbar()
+        self.custom_toolbar = Gtk.Toolbar()
+        toolbox = ToolbarBox()
 
-            # Activity toolbar
-            activity_button = ActivityToolbarButton(self)
+        # Activity toolbar
+        activity_button = ActivityToolbarButton(self)
 
-            toolbox.toolbar.insert(activity_button, 0)
-            activity_button.show()
+        toolbox.toolbar.insert(activity_button, 0)
+        activity_button.show()
 
-            yupana_toolbar_button = ToolbarButton(
-                label=_("Mode"), page=yupana_toolbar,
-                icon_name='preferences-system')
-            yupana_toolbar.show()
-            toolbox.toolbar.insert(yupana_toolbar_button, -1)
-            yupana_toolbar_button.show()
+        yupana_toolbar_button = ToolbarButton(
+            label=_("Mode"), page=yupana_toolbar,
+            icon_name='preferences-system')
+        yupana_toolbar.show()
+        toolbox.toolbar.insert(yupana_toolbar_button, -1)
+        yupana_toolbar_button.show()
 
-            custom_toolbar_button = ToolbarButton(
-                label=_("Custom"), page=self.custom_toolbar,
-                icon_name='view-source')
-            self.custom_toolbar.show()
-            toolbox.toolbar.insert(custom_toolbar_button, -1)
-            custom_toolbar_button.show()
+        custom_toolbar_button = ToolbarButton(
+            label=_("Custom"), page=self.custom_toolbar,
+            icon_name='view-source')
+        self.custom_toolbar.show()
+        toolbox.toolbar.insert(custom_toolbar_button, -1)
+        custom_toolbar_button.show()
 
-            self.set_toolbar_box(toolbox)
-            toolbox.show()
-            self.toolbar = toolbox.toolbar
-
-        else:
-            # Use pre-0.86 toolbar design
-            toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(toolbox)
-            toolbox.add_toolbar(_('Yupana'), yupana_toolbar)
-            toolbox.add_toolbar(_('Custom'), self.custom_toolbar)
-            toolbox.show()
-            toolbox.set_current_toolbar(1)
-            self.toolbar = yupana_toolbar
+        self.set_toolbar_box(toolbox)
+        toolbox.show()
+        self.toolbar = toolbox.toolbar
 
         self._new_yupana_button = button_factory(
             'edit-delete', self.toolbar, self._new_yupana_cb,
             tooltip=_('Clear the yupana.'))
 
-        if not _have_toolbox:
-            separator_factory(yupana_toolbar, False, True)
+        separator_factory(yupana_toolbar, False, True)
 
         self.ten_button = radio_factory(
             'ten', yupana_toolbar, self._ten_cb, tooltip=_('decimal mode'),
@@ -151,9 +133,9 @@ class YupanaActivity(activity.Activity):
             'factor', yupana_toolbar, self._factor_cb,
             tooltip=_('prime-factor mode'),
             group=self.ten_button)
-        self.fibanocci_button = radio_factory(
-            'fibanocci', yupana_toolbar, self._fibanocci_cb,
-            tooltip=_('fibanocci mode'),
+        self.fibonacci_button = radio_factory(
+            'fibonacci', yupana_toolbar, self._fibonacci_cb,
+            tooltip=_('Fibonacci mode'),
             group=self.ten_button)
         self.custom_button = radio_factory(
             'view-source', yupana_toolbar, self._custom_cb,
@@ -161,17 +143,15 @@ class YupanaActivity(activity.Activity):
             group=self.ten_button)
 
         separator_factory(self.toolbar, False, False)
-        self.status = label_factory(self.toolbar, '')
+        self.status = label_factory(self.toolbar, '', width=200)
         self.status.set_label(_('decimal mode'))
 
-        if _have_toolbox:
-            separator_factory(toolbox.toolbar, True, False)
+        separator_factory(toolbox.toolbar, True, False)
 
-        if _have_toolbox:
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl>q'
-            toolbox.toolbar.insert(stop_button, -1)
-            stop_button.show()
+        stop_button = StopButton(self)
+        stop_button.props.accelerator = '<Ctrl>q'
+        toolbox.toolbar.insert(stop_button, -1)
+        stop_button.show()
 
     def _make_custom_toolbar(self):
         self._ones = entry_factory(str(self._yupana.custom[0]),
@@ -212,9 +192,9 @@ class YupanaActivity(activity.Activity):
         self._yupana.new_yupana(mode='factor')
         self.status.set_label(_('prime-factor mode'))
 
-    def _fibanocci_cb(self, button=None):
-        self._yupana.new_yupana(mode='fibanocci')
-        self.status.set_label(_('fibanocci mode'))
+    def _fibonacci_cb(self, button=None):
+        self._yupana.new_yupana(mode='fibonacci')
+        self.status.set_label(_('Fibonacci mode'))
 
     def _custom_cb(self, button=None):
         if hasattr(self, '_ones'):
@@ -256,8 +236,8 @@ class YupanaActivity(activity.Activity):
                 self.twenty_button.set_active(True)
             elif self.metadata['mode'] == 'factor':
                 self.factor_button.set_active(True)
-            elif self.metadata['mode'] == 'fibanocci':
-                self.fibanocci_button.set_active(True)
+            elif self.metadata['mode'] == 'fibonacci':
+                self.fibonacci_button.set_active(True)
             else:
                 self.custom_button.set_active(True)
         if 'dotlist' in self.metadata:
diff --git a/activity/activity.info b/activity/activity.info
index a467072..4e625c7 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Yupana
-activity_version = 5
+activity_version = 6
 license = GPLv3
 bundle_id = org.sugarlabs.YupanaActivity
 exec = sugar-activity YupanaActivity.YupanaActivity
diff --git a/icons/factor.svg b/icons/factor.svg
index 40b1d23..5e561c2 100644
--- a/icons/factor.svg
+++ b/icons/factor.svg
@@ -41,46 +41,56 @@
 
 
 
-<g
+<rect
+   width="55"
+   height="55"
+   x="0"
+   y="0"
+   id="rect3018"
+   style="fill:#282828;fill-opacity:1;stroke:none" /><g
    transform="translate(0.77259684,0.78014565)"
    id="g3071"><text
+   x="9.7387857"
+   y="21.770252"
+   id="text2837"
+   xml:space="preserve"
+   style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
      x="9.7387857"
      y="21.770252"
-     id="text2837"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="9.7387857"
-       y="21.770252"
-       id="tspan2839"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">1</tspan></text>
+     id="tspan2839"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">1</tspan></text>
+
 <text
+   x="32.054886"
+   y="21.888905"
+   id="text2837-9"
+   xml:space="preserve"
+   style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
      x="32.054886"
      y="21.888905"
-     id="text2837-9"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="32.054886"
-       y="21.888905"
-       id="tspan2839-9"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">2</tspan></text>
+     id="tspan2839-9"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">2</tspan></text>
+
 <text
+   x="10.345231"
+   y="44.655296"
+   id="text2837-99"
+   xml:space="preserve"
+   style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
      x="10.345231"
      y="44.655296"
-     id="text2837-99"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="10.345231"
-       y="44.655296"
-       id="tspan2839-7"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">3</tspan></text>
+     id="tspan2839-7"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">3</tspan></text>
+
 <text
+   x="31.984575"
+   y="44.536644"
+   id="text2837-5"
+   xml:space="preserve"
+   style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
      x="31.984575"
      y="44.536644"
-     id="text2837-5"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="31.984575"
-       y="44.536644"
-       id="tspan2839-3"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">5</tspan></text>
+     id="tspan2839-3"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">5</tspan></text>
+
 </g></svg>
\ No newline at end of file
diff --git a/icons/fibanocci.svg b/icons/fibanocci.svg
index da535f1..81b15b3 100644
--- a/icons/fibanocci.svg
+++ b/icons/fibanocci.svg
@@ -45,7 +45,13 @@
 
 
 
-<text
+<rect
+   width="55"
+   height="55"
+   x="0"
+   y="0"
+   id="rect3018"
+   style="fill:#282828;fill-opacity:1;stroke:none" /><text
    x="10.511383"
    y="22.550398"
    id="text2837"
@@ -55,6 +61,7 @@
      y="22.550398"
      id="tspan2839"
      style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">1</tspan></text>
+
 <text
    x="32.827484"
    y="22.66905"
@@ -65,6 +72,7 @@
      y="22.66905"
      id="tspan2839-9"
      style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">2</tspan></text>
+
 <text
    x="11.117828"
    y="45.435444"
@@ -75,6 +83,7 @@
      y="45.435444"
      id="tspan2839-7"
      style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">5</tspan></text>
+
 <text
    x="26.793793"
    y="45.316792"
@@ -85,4 +94,5 @@
      y="45.316792"
      id="tspan2839-3"
      style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">20</tspan></text>
+
 </svg>
\ No newline at end of file
diff --git a/icons/ten.svg b/icons/ten.svg
index 5dbff6a..60b32ce 100644
--- a/icons/ten.svg
+++ b/icons/ten.svg
@@ -33,7 +33,13 @@
 			
 		</defs>
 
-<text
+<rect
+   width="55"
+   height="55"
+   x="0"
+   y="0"
+   id="rect3018"
+   style="fill:#282828;fill-opacity:1;stroke:none" /><text
    x="3.8671875"
    y="40.367188"
    id="text2837"
@@ -51,4 +57,5 @@
 
 
 
+
 </svg>
\ No newline at end of file
diff --git a/icons/twenty.svg b/icons/twenty.svg
index 7949bad..59eff3a 100644
--- a/icons/twenty.svg
+++ b/icons/twenty.svg
@@ -33,7 +33,13 @@
 			
 		</defs>
 
-<text
+<rect
+   width="55"
+   height="55"
+   x="0"
+   y="0"
+   id="rect3018"
+   style="fill:#282828;fill-opacity:1;stroke:none" /><text
    x="4.5263672"
    y="40.367188"
    id="text2837"
@@ -51,4 +57,5 @@
 
 
 
+
 </svg>
\ No newline at end of file
diff --git a/po/Yupana.pot b/po/Yupana.pot
index 2e078e2..910a59d 100644
--- a/po/Yupana.pot
+++ b/po/Yupana.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-05 15:57-0500\n"
+"POT-Creation-Date: 2012-02-06 15:11-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,62 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: activity/activity.info:2 YupanaActivity.py:108
+#: activity/activity.info:2 YupanaActivity.py:129
 msgid "Yupana"
 msgstr ""
 
-#: YupanaActivity.py:115
+#: YupanaActivity.py:108
+msgid "Mode"
+msgstr ""
+
+#: YupanaActivity.py:115 YupanaActivity.py:130
+msgid "Custom"
+msgstr ""
+
+#: YupanaActivity.py:137
 msgid "Clear the yupana."
 msgstr ""
+
+#: YupanaActivity.py:143 YupanaActivity.py:164 YupanaActivity.py:205
+msgid "decimal mode"
+msgstr ""
+
+#: YupanaActivity.py:147 YupanaActivity.py:209
+msgid "base-twenty mode"
+msgstr ""
+
+#: YupanaActivity.py:151 YupanaActivity.py:213
+msgid "prime-factor mode"
+msgstr ""
+
+#: YupanaActivity.py:155 YupanaActivity.py:217
+msgid "fibanocci mode"
+msgstr ""
+
+#: YupanaActivity.py:159 YupanaActivity.py:230
+msgid "custom mode"
+msgstr ""
+
+#: YupanaActivity.py:178
+msgid "one row"
+msgstr ""
+
+#: YupanaActivity.py:181
+msgid "two row"
+msgstr ""
+
+#: YupanaActivity.py:184
+msgid "three row"
+msgstr ""
+
+#: YupanaActivity.py:187
+msgid "five row"
+msgstr ""
+
+#: YupanaActivity.py:192
+msgid "base"
+msgstr ""
+
+#: YupanaActivity.py:196
+msgid "Reload custom values."
+msgstr ""
diff --git a/setup.py b/setup.py
index e5026ee..bdeaed6 100755..100644
--- a/setup.py
+++ b/setup.py
@@ -1,32 +1,5 @@
 #!/usr/bin/env python
-import os
-import sys
+from sugar3.activity import bundlebuilder
+if __name__ == "__main__":
+    bundlebuilder.start()
 
-if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
-    # Remove the argument from the stack so we don't cause problems
-    # for distutils
-    sys.argv.pop(1)
-    
-    import glob, os.path, string
-    from distutils.core import setup
-    
-    DATA_FILES = [
-        ('icons', glob.glob('icons/*')),
-        ('images', glob.glob('images/*')),
-        ('/usr/share/applications', ['turtleart.desktop'])
-        ]
-
-    setup (name = 'Turtle Art',
-           description = "A LOGO-like tool for teaching programming",
-           author = "Walter Bender",
-           author_email = "walter.bender@gmail.com",
-           version = '0.9.4',
-           packages = ['TurtleArt'],
-           scripts = ['turtleart'],
-           data_files = DATA_FILES,
-           )
-else: 
-    from sugar.activity import bundlebuilder
-
-    if __name__ == "__main__":
-        bundlebuilder.start()
diff --git a/sprites.py b/sprites.py
index 2b8bb55..d1a4562 100644
--- a/sprites.py
+++ b/sprites.py
@@ -24,7 +24,7 @@
 '''
 
 sprites.py is a simple sprites library for managing graphics objects,
-'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+'sprites', on a Gtk.DrawingArea. It manages multiple sprites with
 methods such as move, hide, set_layer, etc.
 
 There are two classes:
@@ -68,7 +68,7 @@ Example usage:
 
 # method for converting SVG to a gtk pixbuf
 def svg_str_to_pixbuf(svg_string):
-    pl = gtk.gdk.PixbufLoader('svg')
+    pl = GdkPixbuf.PixbufLoader('svg')
     pl.write(svg_string)
     pl.close()
     pixbuf = pl.get_pixbuf()
@@ -76,21 +76,20 @@ def svg_str_to_pixbuf(svg_string):
 
 '''
 
-import pygtk
-pygtk.require('2.0')
-import gtk
-import pango
-import pangocairo
+import gi
+from gi.repository import Gtk, GdkPixbuf, Gdk
+from gi.repository import Pango, PangoCairo
 import cairo
 
+
 class Sprites:
     ''' A class for the list of sprites and everything they share in common '''
 
     def __init__(self, widget):
         ''' Initialize an empty array of sprites '''
+        self.cr = None
         self.widget = widget
         self.list = []
-        self.cr = None
 
     def set_cairo_context(self, cr):
         ''' Cairo context may be set or reset after __init__ '''
@@ -98,7 +97,7 @@ class Sprites:
 
     def get_sprite(self, i):
         ''' Return a sprint from the array '''
-        if i < 0 or i > len(self.list) - 1:
+        if i < 0 or i > len(self.list)-1:
             return(None)
         else:
             return(self.list[i])
@@ -125,11 +124,10 @@ class Sprites:
         if spr in self.list:
             self.list.remove(spr)
 
-    def find_sprite(self, pos, inverse=False):
+    def find_sprite(self, pos):
         ''' Search based on (x, y) position. Return the 'top/first' one. '''
         list = self.list[:]
-        if not inverse:
-            list.reverse()
+        list.reverse()
         for spr in list:
             if spr.hit(pos):
                 return spr
@@ -143,7 +141,6 @@ class Sprites:
         else:
             self.cr = cr
         if cr is None:
-            print 'sprites.redraw_sprites: no Cairo context'
             return
         for spr in self.list:
             if area == None:
@@ -161,11 +158,13 @@ class Sprite:
         ''' Initialize an individual sprite '''
         self._sprites = sprites
         self.save_xy = (x, y)  # remember initial (x, y) position
-        self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
+        self.rect = [int(x), int(y), 0, 0]
         self._scale = [12]
         self._rescale = [True]
         self._horiz_align = ["center"]
         self._vert_align = ["middle"]
+        self._x_pos = [None]
+        self._y_pos = [None]
         self._fd = None
         self._bold = False
         self._italic = False
@@ -173,7 +172,7 @@ class Sprite:
         self._margins = [0, 0, 0, 0]
         self.layer = 100
         self.labels = []
-        self.cached_surfaces = []
+        self.images = []
         self._dx = []  # image offsets
         self._dy = []
         self.type = None
@@ -182,58 +181,47 @@ class Sprite:
 
     def set_image(self, image, i=0, dx=0, dy=0):
         ''' Add an image to the sprite. '''
-        while len(self.cached_surfaces) < i + 1:
-            self.cached_surfaces.append(None)
+        while len(self.images) < i + 1:
+            self.images.append(None)
             self._dx.append(0)
             self._dy.append(0)
+        self.images[i] = image
         self._dx[i] = dx
         self._dy[i] = dy
-        if isinstance(image, gtk.gdk.Pixbuf) or \
-           isinstance(image, cairo.ImageSurface):
-            w = image.get_width()
-            h = image.get_height()
+        if hasattr(self.images[i], 'get_width'):
+            w = self.images[i].get_width()
+            h = self.images[i].get_height()
         else:
-            w, h = image.get_size()
+            w, h = self.images[i].get_size()
         if i == 0:  # Always reset width and height when base image changes.
-            self.rect.width = w + dx
-            self.rect.height = h + dy
+            self.rect[2] = w + dx
+            self.rect[3] = h + dy
         else:
-            if w + dx > self.rect.width:
-                self.rect.width = w + dx
-            if h + dy > self.rect.height:
-                self.rect.height = h + dy
-        if isinstance(image, cairo.ImageSurface):
-            self.cached_surfaces[i] = image
-        else:  # Convert to Cairo surface
-            surface = cairo.ImageSurface(
-                cairo.FORMAT_ARGB32, self.rect.width, self.rect.height)
-            context = cairo.Context(surface)
-            context = gtk.gdk.CairoContext(context)
-            context.set_source_pixbuf(image, 0, 0)
-            context.rectangle(0, 0, self.rect.width, self.rect.height)
-            context.fill()
-            self.cached_surfaces[i] = surface
+            if w + dx > self.rect[2]:
+                self.rect[2] = w + dx
+            if h + dy > self.rect[3]:
+                self.rect[3] = h + dy
 
     def move(self, pos):
         ''' Move to new (x, y) position '''
         self.inval()
-        self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
+        self.rect[0], self.rect[1] = int(pos[0]), int(pos[1])
         self.inval()
 
     def move_relative(self, pos):
         ''' Move to new (x+dx, y+dy) position '''
         self.inval()
-        self.rect.x += int(pos[0])
-        self.rect.y += int(pos[1])
+        self.rect[0] += int(pos[0])
+        self.rect[1] += int(pos[1])
         self.inval()
 
     def get_xy(self):
         ''' Return current (x, y) position '''
-        return (self.rect.x, self.rect.y)
+        return (self.rect[0], self.rect[1])
 
     def get_dimensions(self):
         ''' Return current size '''
-        return (self.rect.width, self.rect.height)
+        return (self.rect[2], self.rect[3])
 
     def get_layer(self):
         ''' Return current layer '''
@@ -251,7 +239,7 @@ class Sprite:
         if layer is not None:
             self.layer = layer
         for i in range(self._sprites.length_of_list()):
-            if layer < self._sprites.get_sprite(i).layer:
+            if self.layer < self._sprites.get_sprite(i).layer:
                 self._sprites.insert_in_list(self, i)
                 self.inval()
                 return
@@ -284,10 +272,12 @@ class Sprite:
             self._rescale.append(self._rescale[0])
             self._horiz_align.append(self._horiz_align[0])
             self._vert_align.append(self._vert_align[0])
+            self._x_pos.append(self._x_pos[0])
+            self._y_pos.append(self._y_pos[0])
 
     def set_font(self, font):
         ''' Set the font for a label '''
-        self._fd = pango.FontDescription(font)
+        self._fd = Pango.FontDescription(font)
 
     def set_label_color(self, rgb):
         ''' Set the font color for a label '''
@@ -305,13 +295,15 @@ class Sprite:
         return
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
-                             vert_align="middle", i=0):
+                             vert_align="middle", x_pos=None, y_pos=None, i=0):
         ''' Set the various label attributes '''
         self._extend_labels_array(i)
         self._scale[i] = scale
         self._rescale[i] = rescale
         self._horiz_align[i] = horiz_align
         self._vert_align[i] = vert_align
+        self._x_pos[i] = x_pos
+        self._y_pos[i] = y_pos
 
     def hide(self):
         ''' Hide a sprite '''
@@ -324,136 +316,148 @@ class Sprite:
 
     def inval(self):
         ''' Invalidate a region for gtk '''
-        self._sprites.widget.queue_draw_area(self.rect.x,
-                                             self.rect.y,
-                                             self.rect.width,
-                                             self.rect.height)
+        # self._sprites.window.invalidate_rect(self.rect, False)
+        self._sprites.widget.queue_draw_area(self.rect[0],
+                                             self.rect[1],
+                                             self.rect[2],
+                                             self.rect[3])
 
     def draw(self, cr=None):
         ''' Draw the sprite (and label) '''
         if cr is None:
-            print 'sprite.draw: no Cairo context.'
+            cr = self._sprites.cr
+        if cr is None:
             return
-        for i, surface in enumerate(self.cached_surfaces):
-            cr.set_source_surface(surface,
-                                  self.rect.x + self._dx[i],
-                                  self.rect.y + self._dy[i])
-            cr.rectangle(self.rect.x + self._dx[i],
-                         self.rect.y + self._dy[i],
-                         self.rect.width,
-                         self.rect.height)
-            cr.fill()
+        for i, img in enumerate(self.images):
+            if isinstance(img, GdkPixbuf.Pixbuf):
+                Gdk.cairo_set_source_pixbuf(cr, img,
+                                            self.rect[0] + self._dx[i],
+                                            self.rect[1] + self._dy[i])
+                cr.rectangle(self.rect[0] + self._dx[i],
+                             self.rect[1] + self._dy[i],
+                             self.rect[2],
+                             self.rect[3])
+                cr.fill()
+            elif type(img) == cairo.ImageSurface:
+                cr.set_source_surface(img, self.rect[0] + self._dx[i],
+                                      self.rect[1] + self._dy[i])
+                cr.rectangle(self.rect[0] + self._dx[i],
+                             self.rect[1] + self._dy[i],
+                             self.rect[2],
+                             self.rect[3])
+                cr.fill()
+            else:
+                print 'sprite.draw: source not a pixbuf (%s)' % (type(img))
         if len(self.labels) > 0:
             self.draw_label(cr)
 
     def hit(self, pos):
         ''' Is (x, y) on top of the sprite? '''
         x, y = pos
-        if x < self.rect.x:
+        if x < self.rect[0]:
             return False
-        if x > self.rect.x + self.rect.width:
+        if x > self.rect[0] + self.rect[2]:
             return False
-        if y < self.rect.y:
+        if y < self.rect[1]:
             return False
-        if y > self.rect.y + self.rect.height:
+        if y > self.rect[1] + self.rect[3]:
             return False
         return True
 
     def draw_label(self, cr):
         ''' Draw the label based on its attributes '''
-        # Create a pangocairo context
-        cr = pangocairo.CairoContext(cr)
-        my_width = self.rect.width - self._margins[0] - self._margins[2]
+        my_width = self.rect[2] - self._margins[0] - self._margins[2]
         if my_width < 0:
             my_width = 0
-        my_height = self.rect.height - self._margins[1] - self._margins[3]
+        my_height = self.rect[3] - self._margins[1] - self._margins[3]
         for i in range(len(self.labels)):
-            pl = cr.create_layout()
-            pl.set_text(str(self.labels[i]))
-            self._fd.set_size(int(self._scale[i] * pango.SCALE))
+            pl = PangoCairo.create_layout(cr)
+            pl.set_text(str(self.labels[i]), -1)
+            self._fd.set_size(int(self._scale[i] * Pango.SCALE))
             pl.set_font_description(self._fd)
-            w = pl.get_size()[0] / pango.SCALE
+            w = pl.get_size()[0] / Pango.SCALE
             if w > my_width:
                 if self._rescale[i]:
                     self._fd.set_size(
-                            int(self._scale[i] * pango.SCALE * my_width / w))
+                            int(self._scale[i] * Pango.SCALE * my_width / w))
                     pl.set_font_description(self._fd)
-                    w = pl.get_size()[0] / pango.SCALE
+                    w = pl.get_size()[0] / Pango.SCALE
                 else:
                     j = len(self.labels[i]) - 1
                     while(w > my_width and j > 0):
                         pl.set_text(
-                            "…" + self.labels[i][len(self.labels[i]) - j:])
-                        self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                            "…" + self.labels[i][len(self.labels[i]) - j:], -1)
+                        self._fd.set_size(int(self._scale[i] * Pango.SCALE))
                         pl.set_font_description(self._fd)
-                        w = pl.get_size()[0] / pango.SCALE
+                        w = pl.get_size()[0] / Pango.SCALE
                         j -= 1
-            if self._horiz_align[i] == "center":
-                x = int(self.rect.x + self._margins[0] + (my_width - w) / 2)
+            if self._x_pos[i] is not None:
+                x = int(self.rect[0] + self._x_pos[i])
+            elif self._horiz_align[i] == "center":
+                x = int(self.rect[0] + self._margins[0] + (my_width - w) / 2)
             elif self._horiz_align[i] == 'left':
-                x = int(self.rect.x + self._margins[0])
+                x = int(self.rect[0] + self._margins[0])
             else: # right
-                x = int(self.rect.x + self.rect.width - w - self._margins[2])
-            h = pl.get_size()[1] / pango.SCALE
-            if self._vert_align[i] == "middle":
-                y = int(self.rect.y + self._margins[1] + (my_height - h) / 2)
+                x = int(self.rect[0] + self.rect[2] - w - self._margins[2])
+            h = pl.get_size()[1] / Pango.SCALE
+            if self._y_pos[i] is not None:
+                y = int(self.rect[1] + self._y_pos[i])
+            elif self._vert_align[i] == "middle":
+                y = int(self.rect[1] + self._margins[1] + (my_height - h) / 2)
             elif self._vert_align[i] == "top":
-                y = int(self.rect.y + self._margins[1])
+                y = int(self.rect[1] + self._margins[1])
             else: # bottom
-                y = int(self.rect.y + self.rect.height - h - self._margins[3])
+                y = int(self.rect[1] + self.rect[3] - h - self._margins[3])
             cr.save()
             cr.translate(x, y)
             cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
-            cr.update_layout(pl)
-            cr.show_layout(pl)
+            PangoCairo.update_layout(cr, pl)
+            PangoCairo.show_layout(cr, pl)
             cr.restore()
 
-    def label_width(self):
+    def label_width(self, cr=None):
         ''' Calculate the width of a label '''
-        cr = pangocairo.CairoContext(self._sprites.cr)
-        if cr is not None:
-            max = 0
-            for i in range(len(self.labels)):
-                pl = cr.create_layout()
-                pl.set_text(self.labels[i])
-                self._fd.set_size(int(self._scale[i] * pango.SCALE))
-                pl.set_font_description(self._fd)
-                w = pl.get_size()[0] / pango.SCALE
-                if w > max:
-                    max = w
-            return max
-        else:
-            return self.rect.width
+        if cr is None:
+            cr = self._sprites.cr
+        max = 0
+        for i in range(len(self.labels)):
+            pl = PangoCairo.create_layout(cr)
+            pl.set_text(str(self.labels[i]), -1)
+            self._fd.set_size(int(self._scale[i] * Pango.SCALE))
+            pl.set_font_description(self._fd)
+            w = pl.get_size()[0] / Pango.SCALE
+            if w > max:
+                max = w
+        return max
 
     def label_safe_width(self):
         ''' Return maximum width for a label '''
-        return self.rect.width - self._margins[0] - self._margins[2]
+        return self.rect[2] - self._margins[0] - self._margins[2]
 
     def label_safe_height(self):
         ''' Return maximum height for a label '''
-        return self.rect.height - self._margins[1] - self._margins[3]
+        return self.rect[3] - self._margins[1] - self._margins[3]
 
     def label_left_top(self):
         ''' Return the upper-left corner of the label safe zone '''
         return(self._margins[0], self._margins[1])
 
     def get_pixel(self, pos, i=0):
-        ''' Return the pixel at (x, y) '''
-        x = int(pos[0] - self.rect.x)
-        y = int(pos[1] - self.rect.y)
-        if x < 0 or x > (self.rect.width - 1) or \
-                y < 0 or y > (self.rect.height - 1):
+        ''' Return the pixl at (x, y) '''
+        x, y = pos
+        x = x - self.rect[0]
+        y = y - self.rect[1]
+        if y > self.images[i].get_height() - 1:
+            return(-1, -1, -1, -1)
+        try:
+            array = self.images[i].get_pixels()
+            if array is not None:
+                offset = (y * self.images[i].get_width() + x) * 4
+                r, g, b, a = ord(array[offset]), ord(array[offset + 1]),\
+                             ord(array[offset + 2]), ord(array[offset + 3])
+                return(r, g, b, a)
+            else:
+                return(-1, -1, -1, -1)
+        except IndexError:
+            print "Index Error: %d %d" % (len(array), offset)
             return(-1, -1, -1, -1)
-
-        # create a new 1x1 cairo surface
-        cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1);
-        cr = cairo.Context(cs)
-        cr.set_source_surface(self.cached_surfaces[i], -x, -y)
-        cr.rectangle(0,0,1,1)
-        cr.set_operator(cairo.OPERATOR_SOURCE)
-        cr.fill()
-        cs.flush() # ensure all writing is done
-        # Read the pixel
-        pixels = cs.get_data()
-        return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0)
-
diff --git a/toolbar_utils.py b/toolbar_utils.py
index 94e6883..72f7100 100644
--- a/toolbar_utils.py
+++ b/toolbar_utils.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2011, Walter Bender
-
+# Port To GTK3:
+# Ignacio Rodriguez <ignaciorodriguez@sugarlabs.org>
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -11,12 +12,12 @@
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
 
-import gtk
+from gi.repository import Gtk
 
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics.toolcombobox import ToolComboBox
 
 
 def combo_factory(combo_array, toolbar, callback, cb_arg=None,
@@ -32,7 +33,7 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None,
     for i, selection in enumerate(combo_array):
         combo.append_item(i, selection, None)
     combo.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(combo)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -46,13 +47,13 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None,
 
 def entry_factory(default_string, toolbar, tooltip=None, max=3):
     ''' Factory for adding a text box to a toolbar '''
-    entry = gtk.Entry()
+    entry = Gtk.Entry()
     entry.set_text(default_string)
     if tooltip is not None and hasattr(entry, 'set_tooltip_text'):
         entry.set_tooltip_text(tooltip)
     entry.set_width_chars(max)
     entry.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(entry)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -87,7 +88,7 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None,
                   group=None):
     ''' Add a radio button to a toolbar '''
     button = RadioToolButton(group=group)
-    button.set_named_icon(name)
+    button.set_icon_name(name)
     if callback is not None:
         if cb_arg is None:
             button.connect('clicked', callback)
@@ -105,12 +106,12 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None,
 
 def label_factory(toolbar, label_text, width=None):
     ''' Factory for adding a label to a toolbar '''
-    label = gtk.Label(label_text)
+    label = Gtk.Label(label_text)
     label.set_line_wrap(True)
     if width is not None:
         label.set_size_request(width, -1)  # doesn't work on XOs
     label.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(label)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
@@ -122,7 +123,7 @@ def label_factory(toolbar, label_text, width=None):
 
 def separator_factory(toolbar, expand=False, visible=True):
     ''' add a separator to a toolbar '''
-    separator = gtk.SeparatorToolItem()
+    separator = Gtk.SeparatorToolItem()
     separator.props.draw = visible
     separator.set_expand(expand)
     if hasattr(toolbar, 'insert'):  # the main toolbar
@@ -134,9 +135,9 @@ def separator_factory(toolbar, expand=False, visible=True):
 
 def image_factory(image, toolbar, tooltip=None):
     ''' Add an image to the toolbar '''
-    img = gtk.Image()
+    img = Gtk.Image()
     img.set_from_pixbuf(image)
-    img_tool = gtk.ToolItem()
+    img_tool = Gtk.ToolItem()
     img_tool.add(img)
     if tooltip is not None:
         img.set_tooltip_text(tooltip)
@@ -149,12 +150,12 @@ def image_factory(image, toolbar, tooltip=None):
 
 
 def spin_factory(default, min, max, callback, toolbar):
-    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
-    spin = gtk.SpinButton(spin_adj, 0, 0)
+    spin_adj = Gtk.Adjustment(default, min, max, 1, 32, 0)
+    spin = Gtk.SpinButton(spin_adj, 0, 0)
     spin_id = spin.connect('value-changed', callback)
     spin.set_numeric(True)
     spin.show()
-    toolitem = gtk.ToolItem()
+    toolitem = Gtk.ToolItem()
     toolitem.add(spin)
     if hasattr(toolbar, 'insert'):  # the main toolbar
         toolbar.insert(toolitem, -1)
diff --git a/utils.py b/utils.py
index ffab831..81a76f8 100644
--- a/utils.py
+++ b/utils.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2011 Walter Bender
+#Copyright (c) 2011,12 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -11,43 +11,28 @@
 
 
 from StringIO import StringIO
-try:
-    OLD_SUGAR_SYSTEM = False
-    import json
-    json.dumps
-    from json import load as jload
-    from json import dump as jdump
-except (ImportError, AttributeError):
-    try:
-        import simplejson as json
-        from simplejson import load as jload
-        from simplejson import dump as jdump
-    except:
-        OLD_SUGAR_SYSTEM = True
+import json
+json.dumps
+from json import load as jload
+from json import dump as jdump
 
 
 def json_load(text):
     """ Load JSON data using what ever resources are available. """
-    if OLD_SUGAR_SYSTEM is True:
-        listdata = json.read(text)
-    else:
-        # strip out leading and trailing whitespace, nulls, and newlines
-        io = StringIO(text)
-        try:
-            listdata = jload(io)
-        except ValueError:
-            # assume that text is ascii list
-            listdata = text.split()
-            for i, value in enumerate(listdata):
-                listdata[i] = int(value)
+    # strip out leading and trailing whitespace, nulls, and newlines
+    io = StringIO(text)
+    try:
+        listdata = jload(io)
+    except ValueError:
+        # assume that text is ascii list
+        listdata = text.split()
+        for i, value in enumerate(listdata):
+            listdata[i] = int(value)
     return listdata
 
 
 def json_dump(data):
     """ Save data using available JSON tools. """
-    if OLD_SUGAR_SYSTEM is True:
-        return json.write(data)
-    else:
-        _io = StringIO()
-        jdump(data, _io)
-        return _io.getvalue()
+    _io = StringIO()
+    jdump(data, _io)
+    return _io.getvalue()
diff --git a/yupana.py b/yupana.py
index bce920a..47e6cd3 100644
--- a/yupana.py
+++ b/yupana.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2011 Walter Bender
+#Copyright (c) 2012 Ignacio Rodriguez
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -10,8 +11,7 @@
 # along with this library; if not, write to the Free Software
 # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
-
-import gtk
+from gi.repository import Gtk, Gdk, GdkPixbuf
 import cairo
 
 from random import uniform
@@ -22,7 +22,7 @@ import logging
 _logger = logging.getLogger('yupana-activity')
 
 try:
-    from sugar.graphics import style
+    from sugar3.graphics import style
     GRID_CELL_SIZE = style.GRID_CELL_SIZE
 except ImportError:
     GRID_CELL_SIZE = 0
@@ -49,13 +49,12 @@ class Yupana():
             parent.show_all()
             self._parent = parent
 
-        self._canvas.set_flags(gtk.CAN_FOCUS)
-        self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-        self._canvas.connect("expose-event", self._expose_cb)
+        self._canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
+        self._canvas.connect("draw", self.__draw_cb)
         self._canvas.connect("button-press-event", self._button_press_cb)
 
-        self._width = gtk.gdk.screen_width()
-        self._height = gtk.gdk.screen_height() - (GRID_CELL_SIZE * 1.5)
+        self._width = Gdk.Screen.width()
+        self._height = Gdk.Screen.height() - (GRID_CELL_SIZE * 1.5)
         self._scale = self._width / (20 * DOT_SIZE * 1.1)
         self._dot_size = int(DOT_SIZE * self._scale)
         self._space = int(self._dot_size / 5.)
@@ -198,7 +197,7 @@ class Yupana():
                     else:
                         self._dots[o + i].set_label('5')
                 self._dots[o - 1].set_label('10')
-            elif mode == 'fibanocci':
+            elif mode == 'fibonacci':
                 for i in range(TEN + 1):
                     if i in [10]:
                         self._dots[o + i].set_label('1')
@@ -293,7 +292,7 @@ class Yupana():
                 return (10 ** e) * 3
             else:
                 return (10 ** e) * 5
-        elif self._mode == 'fibanocci':
+        elif self._mode == 'fibonacci':
             if m in [10]:
                 return 60 ** e
             elif m in [8, 9]:
@@ -330,8 +329,8 @@ class Yupana():
         ''' calculate the grid column and row for a dot '''
         return [dot % TEN, int(dot / TEN)]
 
-    def _expose_cb(self, win, event):
-        self.do_expose_event(event)
+    def __draw_cb(self, canvas, cr):
+	self._sprites.redraw_sprites(cr=cr)
 
     def do_expose_event(self, event):
         ''' Handle the expose-event by drawing '''
@@ -344,17 +343,17 @@ class Yupana():
         self._sprites.redraw_sprites(cr=cr)
 
     def _destroy_cb(self, win, event):
-        gtk.main_quit()
+        Gtk.main_quit()
 
     def _new_dot(self, color):
         ''' generate a dot of a color color '''
         def darken(color):
             ''' return a darker color than color '''
-            gdk_fill_color = gtk.gdk.color_parse(self._fill)
-            gdk_fill_dark_color = gtk.gdk.Color(
+            gdk_fill_color = Gdk.color_parse(self._fill)
+            gdk_fill_dark_color = Gdk.Color(
                 int(gdk_fill_color.red * 0.5),
                 int(gdk_fill_color.green * 0.5),
-                int(gdk_fill_color.blue * 0.5))
+                int(gdk_fill_color.blue * 0.5)).to_string()
             return str(gdk_fill_dark_color)
 
         self._dot_cache = {}
@@ -381,8 +380,7 @@ class Yupana():
             surface = cairo.ImageSurface(cairo.FORMAT_ARGB32,
                                          self._svg_width, self._svg_height)
             context = cairo.Context(surface)
-            context = gtk.gdk.CairoContext(context)
-            context.set_source_pixbuf(pixbuf, 0, 0)
+	    Gdk.cairo_set_source_pixbuf(context, pixbuf, 0, 0)
             context.rectangle(0, 0, self._svg_width, self._svg_height)
             context.fill()
             self._dot_cache[color] = surface
@@ -480,8 +478,12 @@ class Yupana():
 
 def svg_str_to_pixbuf(svg_string):
     """ Load pixbuf from SVG string """
-    pl = gtk.gdk.PixbufLoader('svg')
-    pl.write(svg_string)
-    pl.close()
-    pixbuf = pl.get_pixbuf()
-    return pixbuf
+    try:
+        pl = GdkPixbuf.PixbufLoader.new_with_type('svg')
+        pl.write(svg_string)
+        pl.close()
+        pixbuf = pl.get_pixbuf()
+        return pixbuf
+    except:
+        print svg_string
+        return None