1 files changed, 14 insertions, 18 deletions
diff --git a/TurtleArt/tagplay.py b/TurtleArt/tagplay.py
index dbce7ed..e264fc9 100644
--- a/TurtleArt/tagplay.py
+++ b/TurtleArt/tagplay.py
@@ -26,16 +26,12 @@
 import logging
 import os
 
-import pygtk
-pygtk.require('2.0')
-
-import gobject
-gobject.threads_init()
+from util.gtkcompat import GObject, Gtk
+GObject.threads_init()
 
 import pygst
 import gst
 import gst.interfaces
-import gtk
 
 import urllib
 
@@ -97,11 +93,11 @@ class Gplay():
         self.got_stream_info = False
         self.currentplaying = 0
 
-        self.bin = gtk.Window()
+        self.bin = Gtk.Window()
 
         self.videowidget = VideoWidget()
         self.bin.add(self.videowidget)
-        self.bin.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
+        self.bin.set_type_hint(Gdk.WindowTypeHint.NORMAL)
         self.bin.set_decorated(False)
         if lc.tw.running_sugar:
             self.bin.set_transient_for(lc.tw.activity)
@@ -170,14 +166,14 @@ class Gplay():
                 self.player.play()
 
 
-class GstPlayer(gobject.GObject):
+class GstPlayer(GObject.GObject):
     __gsignals__ = {
-        'error': (gobject.SIGNAL_RUN_FIRST, None, [str, str]),
-        'eos': (gobject.SIGNAL_RUN_FIRST, None, []),
-        'stream-info': (gobject.SIGNAL_RUN_FIRST, None, [object])}
+        'error': (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
+        'eos': (GObject.SignalFlags.RUN_FIRST, None, []),
+        'stream-info': (GObject.SignalFlags.RUN_FIRST, None, [object])}
 
     def __init__(self, videowidget):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.playing = False
         self.error = False
@@ -277,14 +273,14 @@ class GstPlayer(gobject.GObject):
         return self.playing
 
 
-class VideoWidget(gtk.DrawingArea):
+class VideoWidget(Gtk.DrawingArea):
 
     def __init__(self):
-        gtk.DrawingArea.__init__(self)
-        self.set_events(gtk.gdk.EXPOSURE_MASK)
+        GObject.GObject.__init__(self)
+        self.set_events(Gdk.EventMask.EXPOSURE_MASK)
         self.imagesink = None
-        self.unset_flags(gtk.DOUBLE_BUFFERED)
-        self.set_flags(gtk.APP_PAINTABLE)
+        self.unset_flags(Gtk.DOUBLE_BUFFERED)
+        self.set_flags(Gtk.APP_PAINTABLE)
 
     def do_expose_event(self, event):
         if self.imagesink: