pygi-convert

10 files changed, 150 insertions, 150 deletions

diff --git a/activity.py b/activity.py
index 30e9dc0..6861420 100644
--- a/activity.py
+++ b/activity.py
@@ -25,9 +25,9 @@
 from sugar3.activity import activity
 from sugar3.presence import presenceservice
 import logging
-import gtk
-import gobject
-import pango
+from gi.repository import Gtk
+from gi.repository import GObject
+from gi.repository import Pango
 import cjson
 from gettext import gettext as _
 
@@ -75,20 +75,20 @@ class CursorFactory:
 
     def get_cursor(self, cur_type):
         if not cur_type in self.cursors:
-            cur = gtk.gdk.Cursor(cur_type)
+            cur = Gdk.Cursor.new(cur_type)
             self.cursors[cur_type] = cur
         return self.cursors[cur_type]
 
 
 class SpeakActivity(SharedActivity):
     def __init__(self, handle):
-        self.notebook = gtk.Notebook()
+        self.notebook = Gtk.Notebook()
         self.notebook.connect_after('map', self.__map_canvasactivity_cb)
 
         SharedActivity.__init__(self, self.notebook, SERVICE, handle)
 
         self._cursor = None
-        self.set_cursor(gtk.gdk.LEFT_PTR)
+        self.set_cursor(Gdk.CursorType.LEFT_PTR)
         self.__resume_filename = None
         self.__postponed_share = []
         self.__on_save_instance = []
@@ -100,28 +100,28 @@ class SpeakActivity(SharedActivity):
         self.connect("notify::active", self._activeCb)
 
         # make a box to type into
-        self.entrycombo = gtk.combo_box_entry_new_text()
+        self.entrycombo = Gtk.combo_box_entry_new_text()
         self.entrycombo.connect("changed", self._combo_changed_cb)
-        self.entry = self.entrycombo.child
+        self.entry = self.entrycombo.get_child()
         self.entry.set_editable(True)
         self.entry.connect('activate', self._entry_activate_cb)
         self.entry.connect("key-press-event", self._entry_key_press_cb)
-        self.input_font = pango.FontDescription(str='sans bold 24')
+        self.input_font = Pango.FontDescription(str='sans bold 24')
         self.entry.modify_font(self.input_font)
 
         self.face = face.View()
         self.face.show()
 
         # layout the screen
-        box = gtk.VBox(homogeneous=False)
-        box.pack_start(self.face)
-        box.pack_start(self.entrycombo, expand=False)
+        box = Gtk.VBox(homogeneous=False)
+        box.pack_start(self.face, True, True, 0)
+        box.pack_start(self.entrycombo, False, True, 0)
 
-        self.add_events(gtk.gdk.POINTER_MOTION_HINT_MASK
-                | gtk.gdk.POINTER_MOTION_MASK)
+        self.add_events(Gdk.EventMask.POINTER_MOTION_HINT_MASK
+                | Gdk.EventMask.POINTER_MOTION_MASK)
         self.connect("motion_notify_event", self._mouse_moved_cb)
 
-        box.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+        box.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
         box.connect("button_press_event", self._mouse_clicked_cb)
 
         # desktop
@@ -193,7 +193,7 @@ class SpeakActivity(SharedActivity):
                 icon_name='face')
         toolbox.toolbar.insert(face_button, -1)
 
-        separator = gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem()
         separator.set_draw(False)
         separator.set_expand(True)
         toolbox.toolbar.insert(separator, -1)
@@ -216,7 +216,7 @@ class SpeakActivity(SharedActivity):
             self.share_instance(tube_conn, initiator)
 
     def set_cursor(self, cursor):
-        if not isinstance(cursor, gtk.gdk.Cursor):
+        if not isinstance(cursor, Gdk.Cursor):
             cursor = CursorFactory().get_cursor(cursor)
 
         if self._cursor != cursor:
@@ -315,12 +315,12 @@ class SpeakActivity(SharedActivity):
         index = entry.props.cursor_position
         layout = entry.get_layout()
         pos = layout.get_cursor_pos(index)
-        x = pos[0][0] / pango.SCALE - entry.props.scroll_offset
+        x = pos[0][0] / Pango.SCALE - entry.props.scroll_offset
         y = entry.get_allocation().y
         self.face.look_at(pos=(x, y))
 
     def get_mouse(self):
-        display = gtk.gdk.display_get_default()
+        display = Gdk.Display.get_default()
         screen, mouseX, mouseY, modifiers = display.get_pointer()
         return mouseX, mouseY
 
@@ -333,14 +333,14 @@ class SpeakActivity(SharedActivity):
         pass
 
     def make_voice_bar(self):
-        voicebar = gtk.Toolbar()
+        voicebar = Gtk.Toolbar()
 
-        self.pitchadj = gtk.Adjustment(self.face.status.pitch, 0,
+        self.pitchadj = Gtk.Adjustment(self.face.status.pitch, 0,
                 espeak.PITCH_MAX, 1, espeak.PITCH_MAX / 10, 0)
-        pitchbar = gtk.HScale(self.pitchadj)
+        pitchbar = Gtk.HScale(self.pitchadj)
         pitchbar.set_draw_value(False)
         # pitchbar.set_inverted(True)
-        pitchbar.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
+        pitchbar.set_update_policy(Gtk.UPDATE_DISCONTINUOUS)
         pitchbar.set_size_request(240, 15)
 
         pitchbar_toolitem = ToolWidget(
@@ -348,12 +348,12 @@ class SpeakActivity(SharedActivity):
                 label_text=_('Pitch:'))
         voicebar.insert(pitchbar_toolitem, -1)
 
-        self.rateadj = gtk.Adjustment(self.face.status.rate, 0,
+        self.rateadj = Gtk.Adjustment(self.face.status.rate, 0,
                                    espeak.RATE_MAX, 1, espeak.RATE_MAX / 10, 0)
-        ratebar = gtk.HScale(self.rateadj)
+        ratebar = Gtk.HScale(self.rateadj)
         ratebar.set_draw_value(False)
         # ratebar.set_inverted(True)
-        ratebar.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
+        ratebar.set_update_policy(Gtk.UPDATE_DISCONTINUOUS)
         ratebar.set_size_request(240, 15)
 
         ratebar_toolitem = ToolWidget(
@@ -373,7 +373,7 @@ class SpeakActivity(SharedActivity):
         self.face.say_notification(_("rate adjusted"))
 
     def make_face_bar(self):
-        facebar = gtk.Toolbar()
+        facebar = Gtk.Toolbar()
 
         self.mouth_shape_combo = ComboBox()
         self.mouth_shape_combo.append_item(mouth.Mouth, _("Simple"))
@@ -397,10 +397,10 @@ class SpeakActivity(SharedActivity):
                 label_text=_('Eyes:'))
         facebar.insert(eye_shape_toolitem, -1)
 
-        self.numeyesadj = gtk.Adjustment(2, 1, 5, 1, 1, 0)
-        numeyesbar = gtk.HScale(self.numeyesadj)
+        self.numeyesadj = Gtk.Adjustment(2, 1, 5, 1, 1, 0)
+        numeyesbar = Gtk.HScale(self.numeyesadj)
         numeyesbar.set_draw_value(False)
-        numeyesbar.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
+        numeyesbar.set_update_policy(Gtk.UPDATE_DISCONTINUOUS)
         numeyesbar.set_size_request(240, 15)
 
         numeyesbar_toolitem = ToolWidget(
@@ -443,7 +443,7 @@ class SpeakActivity(SharedActivity):
 
     def _entry_key_press_cb(self, combo, event):
         # make the up/down arrows navigate through our history
-        keyname = gtk.gdk.keyval_name(event.keyval)
+        keyname = Gdk.keyval_name(event.keyval)
         if keyname == "Up":
             index = self.entrycombo.get_active()
             if index > 0:
@@ -548,7 +548,7 @@ class SpeakActivity(SharedActivity):
         if not button.props.active:
             return
 
-        is_first_session = not self.chat.me.flags() & gtk.MAPPED
+        is_first_session = not self.chat.me.get_mapped()
 
         self._mode = MODE_CHAT
         self.face.shut_up()
@@ -570,4 +570,4 @@ class SpeakActivity(SharedActivity):
 
 
 # activate gtk threads when this module loads
-gtk.gdk.threads_init()
+Gdk.threads_init()
diff --git a/brain.py b/brain.py
index d98578f..409bbd7 100644
--- a/brain.py
+++ b/brain.py
@@ -19,8 +19,8 @@
 # along with HablarConSara.activity.
 # If not, see <http://www.gnu.org/licenses/>.
 
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 from gettext import gettext as _
 
 import logging
@@ -87,7 +87,7 @@ def load(activity, voice, sorry=None):
         return False
 
     old_cursor = activity._cursor
-    activity.set_cursor(gtk.gdk.WATCH)
+    activity.set_cursor(Gdk.WATCH)
 
     def load_brain():
         global _kernel
@@ -132,5 +132,5 @@ def load(activity, voice, sorry=None):
         elif sorry:
             activity.face.say_notification(sorry)
 
-    gobject.idle_add(load_brain)
+    GObject.idle_add(load_brain)
     return True
diff --git a/chat.py b/chat.py
index c917498..4d1fcc7 100644
--- a/chat.py
+++ b/chat.py
@@ -14,8 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import gtk
-import pango
+from gi.repository import Gtk
+from gi.repository import Pango
 import logging
 from gettext import gettext as _
 
@@ -32,8 +32,8 @@ from chatbox import ChatBox
 
 logger = logging.getLogger('speak')
 
-BUDDY_SIZE = min(100, min(gtk.gdk.screen_width(),
-        gtk.gdk.screen_height() - style.LARGE_ICON_SIZE) / 5)
+BUDDY_SIZE = min(100, min(Gdk.Screen.width(),
+        Gdk.Screen.height() - style.LARGE_ICON_SIZE) / 5)
 BUDDY_PAD = 5
 
 BUDDIES_WIDTH = int(BUDDY_SIZE * 2.5)
@@ -44,9 +44,9 @@ ENTRY_XPAD = 0
 ENTRY_YPAD = 7
 
 
-class View(gtk.EventBox):
+class View(Gtk.EventBox):
     def __init__(self):
-        gtk.EventBox.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.messenger = None
         self.me = None
@@ -56,15 +56,15 @@ class View(gtk.EventBox):
 
         # buddies box
 
-        self._buddies_list = gtk.VBox()
+        self._buddies_list = Gtk.VBox()
         self._buddies_list.set_homogeneous(False)
         self._buddies_list.props.spacing = ENTRY_YPAD
 
-        self._buddies_box = gtk.ScrolledWindow()
-        self._buddies_box.set_policy(gtk.POLICY_ALWAYS,
-                                     gtk.POLICY_NEVER)
-        evbox = gtk.EventBox()
-        evbox.modify_bg(gtk.STATE_NORMAL, BUDDIES_COLOR.get_gdk_color())
+        self._buddies_box = Gtk.ScrolledWindow()
+        self._buddies_box.set_policy(Gtk.PolicyType.ALWAYS,
+                                     Gtk.PolicyType.NEVER)
+        evbox = Gtk.EventBox()
+        evbox.modify_bg(Gtk.StateType.NORMAL, BUDDIES_COLOR.get_gdk_color())
         evbox.add(self._buddies_list)
         evbox.show()
         self._buddies_box.add_with_viewport(evbox)
@@ -75,13 +75,13 @@ class View(gtk.EventBox):
         self.me, my_face_widget = self._new_face(self._chat.owner,
                 ENTRY_COLOR)
 
-        chat_post = gtk.TextView()
-        chat_post.modify_bg(gtk.STATE_INSENSITIVE,
+        chat_post = Gtk.TextView()
+        chat_post.modify_bg(Gtk.StateType.INSENSITIVE,
                 style.COLOR_WHITE.get_gdk_color())
-        chat_post.modify_base(gtk.STATE_INSENSITIVE,
+        chat_post.modify_base(Gtk.StateType.INSENSITIVE,
                 style.COLOR_WHITE.get_gdk_color())
         chat_post.connect('key-press-event', self._key_press_cb)
-        chat_post.props.wrap_mode = gtk.WRAP_WORD_CHAR
+        chat_post.props.wrap_mode = Gtk.WrapMode.WORD_CHAR
         chat_post.set_size_request(-1, BUDDY_SIZE - ENTRY_YPAD * 2)
         chat_post_box = RoundBox()
         chat_post_box.background_color = style.COLOR_WHITE
@@ -93,23 +93,23 @@ class View(gtk.EventBox):
         chat_entry.background_color = ENTRY_COLOR
         chat_entry.border_color = style.COLOR_WHITE
         chat_entry.pack_start(my_face_widget, False, True, 0)
-        separator = gtk.EventBox()
-        separator.modify_bg(gtk.STATE_NORMAL, ENTRY_COLOR.get_gdk_color())
+        separator = Gtk.EventBox()
+        separator.modify_bg(Gtk.StateType.NORMAL, ENTRY_COLOR.get_gdk_color())
         separator.set_size_request(ENTRY_YPAD, -1)
         separator.show()
         chat_entry.pack_start(separator, False, False)
         chat_entry.pack_start(chat_post_box, True, True, ENTRY_XPAD)
 
-        evbox = gtk.EventBox()
-        evbox.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color())
-        chat_box = gtk.VBox()
+        evbox = Gtk.EventBox()
+        evbox.modify_bg(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color())
+        chat_box = Gtk.VBox()
         chat_box.pack_start(self._chat, True, True)
         chat_box.pack_start(chat_entry, False, True)
         evbox.add(chat_box)
 
         # desk
 
-        self._desk = gtk.HBox()
+        self._desk = Gtk.HBox()
         self._desk.pack_start(evbox, True, True)
         self._desk.show_all()
 
@@ -158,17 +158,17 @@ class View(gtk.EventBox):
         self.me.shut_up()
 
     def _add_buddy(self, buddy):
-        evbox = gtk.EventBox()
-        evbox.modify_bg(gtk.STATE_NORMAL, BUDDIES_COLOR.get_gdk_color())
-        box = gtk.HBox()
+        evbox = Gtk.EventBox()
+        evbox.modify_bg(Gtk.StateType.NORMAL, BUDDIES_COLOR.get_gdk_color())
+        box = Gtk.HBox()
 
         buddy_face, buddy_widget = self._new_face(buddy, BUDDIES_COLOR)
 
-        char_box = gtk.VBox()
-        nick = gtk.Label(buddy.props.nick)
-        lang = gtk.Label()
-        char_box.pack_start(nick)
-        char_box.pack_start(lang)
+        char_box = Gtk.VBox()
+        nick = Gtk.Label(label=buddy.props.nick)
+        lang = Gtk.Label()
+        char_box.pack_start(nick, True, True, 0)
+        char_box.pack_start(lang, True, True, 0)
 
         box.pack_start(buddy_widget, False, False, ENTRY_YPAD)
         box.pack_start(char_box, True, True, ENTRY_YPAD)
@@ -178,14 +178,14 @@ class View(gtk.EventBox):
                 'face': buddy_face,
                 'lang': lang
                 }
-        self._buddies_list.pack_start(box)
+        self._buddies_list.pack_start(box, True, True, 0)
 
         if len(self._buddies) == 1:
-            self._desk.pack_start(self._buddies_box)
+            self._desk.pack_start(self._buddies_box, True, True, 0)
 
     def _key_press_cb(self, widget, event):
-        if event.keyval == gtk.keysyms.Return:
-            if not (event.state & gtk.gdk.CONTROL_MASK):
+        if event.keyval == Gdk.KEY_Return:
+            if not (event.get_state() & Gdk.ModifierType.CONTROL_MASK):
                 text = widget.get_buffer().props.text
 
                 if text:
diff --git a/chatbox.py b/chatbox.py
index c762a34..eeb8f86 100644
--- a/chatbox.py
+++ b/chatbox.py
@@ -16,9 +16,9 @@
 
 # This code is a stripped down version of the Chat
 
-import gtk
+from gi.repository import Gtk
 import logging
-import pango
+from gi.repository import Pango
 import re
 from datetime import datetime
 from gettext import gettext as _
@@ -39,32 +39,32 @@ URL_REGEXP = re.compile('((http|ftp)s?://)?'
     '(:[1-9][0-9]{0,4})?(/[-a-zA-Z0-9/%~@&_+=;:,.?#]*[a-zA-Z0-9/])?')
 
 
-class TextBox(gtk.TextView):
+class TextBox(Gtk.TextView):
 
-    hand_cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
+    hand_cursor = Gdk.Cursor.new(Gdk.HAND2)
 
     def __init__(self, color, bg_color, lang_rtl):
         self._lang_rtl = lang_rtl
-        gtk.TextView.__init__(self)
+        GObject.GObject.__init__(self)
         self.set_editable(False)
         self.set_cursor_visible(False)
-        self.set_wrap_mode(gtk.WRAP_WORD_CHAR)
+        self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
         self.get_buffer().set_text("", 0)
         self.iter_text = self.get_buffer().get_iter_at_offset(0)
         self.fg_tag = self.get_buffer().create_tag("foreground_color",
             foreground=color.get_html())
         self._subscript_tag = self.get_buffer().create_tag('subscript',
-                    rise=-7 * pango.SCALE)  # in pixels
+                    rise=-7 * Pango.SCALE)  # in pixels
         self._empty = True
         self.palette = None
         self._mouse_detector = MouseSpeedDetector(self, 200, 5)
         self._mouse_detector.connect('motion-slow', self.__mouse_slow_cb)
-        self.modify_base(gtk.STATE_NORMAL, bg_color.get_gdk_color())
+        self.modify_base(Gtk.StateType.NORMAL, bg_color.get_gdk_color())
 
-        self.add_events(gtk.gdk.POINTER_MOTION_MASK | \
-                        gtk.gdk.BUTTON_PRESS_MASK | \
-                        gtk.gdk.BUTTON_RELEASE_MASK | \
-                        gtk.gdk.LEAVE_NOTIFY_MASK)
+        self.add_events(Gdk.EventMask.POINTER_MOTION_MASK | \
+                        Gdk.EventMask.BUTTON_PRESS_MASK | \
+                        Gdk.EventMask.BUTTON_RELEASE_MASK | \
+                        Gdk.EventMask.LEAVE_NOTIFY_MASK)
 
         self.connect('event-after', self.__event_after_cb)
         self.connect('button-press-event', self.__button_press_cb)
@@ -77,16 +77,16 @@ class TextBox(gtk.TextView):
         self._mouse_detector.stop()
 
     def __button_press_cb(self, widget, event):
-        if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
+        if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3:
             # To disable the standard textview popup
             return True
 
     # Links can be activated by clicking.
     def __event_after_cb(self, widget, event):
-        if event.type != gtk.gdk.BUTTON_RELEASE:
+        if event.type != Gdk.BUTTON_RELEASE:
             return False
 
-        x, y = self.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET,
+        x, y = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET,
             int(event.x), int(event.y))
         iter_tags = self.get_iter_at_location(x, y)
 
@@ -131,7 +131,7 @@ class TextBox(gtk.TextView):
         # and if one of them is a link, change the cursor to the "hands" cursor
 
         hovering_over_link = self.check_url_hovering(x, y)
-        win = self.get_window(gtk.TEXT_WINDOW_TEXT)
+        win = self.get_window(Gtk.TextWindowType.TEXT)
         if hovering_over_link:
             win.set_cursor(self.hand_cursor)
             self._mouse_detector.start()
@@ -154,7 +154,7 @@ class TextBox(gtk.TextView):
 
     # Update the cursor image if the pointer moved.
     def __motion_notify_cb(self, widget, event):
-        x, y = self.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET,
+        x, y = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET,
             int(event.x), int(event.y))
         self.set_cursor_if_appropriate(x, y)
         self.window.get_pointer()
@@ -165,7 +165,7 @@ class TextBox(gtk.TextView):
         # (e.g. when a window covering it got iconified).
 
         wx, wy, __ = self.window.get_pointer()
-        bx, by = self.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, wx, wy)
+        bx, by = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, wx, wy)
         self.set_cursor_if_appropriate(bx, by)
         return False
 
@@ -189,23 +189,23 @@ class TextBox(gtk.TextView):
         self._empty = False
 
 
-class ColorLabel(gtk.Label):
+class ColorLabel(Gtk.Label):
 
     def __init__(self, text, color=None):
         self._color = color
         if self._color is not None:
             text = '<span foreground="%s">' % self._color.get_html() +\
                     text + '</span>'
-        gtk.Label.__init__(self)
+        GObject.GObject.__init__(self)
         self.set_use_markup(True)
         self.set_markup(text)
         self.props.selectable = True
 
 
-class ChatBox(gtk.ScrolledWindow):
+class ChatBox(Gtk.ScrolledWindow):
 
     def __init__(self):
-        gtk.ScrolledWindow.__init__(self)
+        GObject.GObject.__init__(self)
 
         self.owner = presenceservice.get_instance().get_owner()
 
@@ -217,15 +217,15 @@ class ChatBox(gtk.ScrolledWindow):
         self._last_msg = None
         self._chat_log = ''
 
-        self._conversation = gtk.VBox()
+        self._conversation = Gtk.VBox()
         self._conversation.set_homogeneous(False)
         self._conversation.props.spacing = style.LINE_WIDTH
         self._conversation.props.border_width = style.LINE_WIDTH
-        evbox = gtk.EventBox()
-        evbox.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color())
+        evbox = Gtk.EventBox()
+        evbox.modify_bg(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color())
         evbox.add(self._conversation)
 
-        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
+        self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.ALWAYS)
         self.add_with_viewport(evbox)
         vadj = self.get_vadjustment()
         vadj.connect('changed', self._scroll_changed_cb)
@@ -283,7 +283,7 @@ class ChatBox(gtk.ScrolledWindow):
         self._add_log(nick, color, text, status_message)
 
         # Check for Right-To-Left languages:
-        if pango.find_base_dir(nick, -1) == pango.DIRECTION_RTL:
+        if Pango.find_base_dir(nick, -1) == Pango.DIRECTION_RTL:
             lang_rtl = True
         else:
             lang_rtl = False
@@ -301,7 +301,7 @@ class ChatBox(gtk.ScrolledWindow):
             self._last_msg.add_text(text)
         else:
             rb = RoundBox()
-            screen_width = gtk.gdk.screen_width()
+            screen_width = Gdk.Screen.width()
             # keep space to the scrollbar
             rb.set_size_request(screen_width - 50, -1)
             rb.props.border_width = style.DEFAULT_PADDING
@@ -312,11 +312,11 @@ class ChatBox(gtk.ScrolledWindow):
             self._last_msg = rb
             if not status_message:
                 name = ColorLabel(text=nick + ':', color=text_color)
-                name_vbox = gtk.VBox()
+                name_vbox = Gtk.VBox()
                 name_vbox.pack_start(name, False, False)
                 rb.pack_start(name_vbox, False, False)
             message = TextBox(text_color, color_fill, lang_rtl)
-            vbox = gtk.VBox()
+            vbox = Gtk.VBox()
             vbox.pack_start(message, True, True)
             rb.pack_start(vbox, True, True)
             self._last_msg = message
diff --git a/combobox.py b/combobox.py
index d021106..3fa1690 100644
--- a/combobox.py
+++ b/combobox.py
@@ -20,22 +20,22 @@
 STABLE.
 """
 
-import gobject
-import gtk
+from gi.repository import GObject
+from gi.repository import Gtk
 
 
-class ComboBox(gtk.ComboBox):
+class ComboBox(Gtk.ComboBox):
 
     def __init__(self):
-        gtk.ComboBox.__init__(self)
+        GObject.GObject.__init__(self)
 
         self._text_renderer = None
         self._icon_renderer = None
 
-        model = gtk.ListStore(gobject.TYPE_PYOBJECT,
-                                    gobject.TYPE_STRING,
-                                    gtk.gdk.Pixbuf,
-                                    gobject.TYPE_BOOLEAN)
+        model = Gtk.ListStore(GObject.TYPE_PYOBJECT,
+                                    GObject.TYPE_STRING,
+                                    GdkPixbuf.Pixbuf,
+                                    GObject.TYPE_BOOLEAN)
         self.set_model(model)
 
         self.set_row_separator_func(self._is_separator)
@@ -56,12 +56,12 @@ class ComboBox(gtk.ComboBox):
             return None
         return row[0]
 
-    value = gobject.property(
+    value = GObject.property(
         type=object, getter=get_value, setter=None)
 
     def _get_real_name_from_theme(self, name, size):
-        icon_theme = gtk.icon_theme_get_default()
-        width, height = gtk.icon_size_lookup(size)
+        icon_theme = Gtk.IconTheme.get_default()
+        width, height = Gtk.icon_size_lookup(size)
         info = icon_theme.lookup_icon(name, max(width, height), 0)
         if not info:
             raise ValueError("Icon '" + name + "' not found.")
@@ -119,32 +119,32 @@ class ComboBox(gtk.ComboBox):
 
     def _item_new(self, action_id, text, icon_name, file_name):
         if not self._icon_renderer and (icon_name or file_name):
-            self._icon_renderer = gtk.CellRendererPixbuf()
+            self._icon_renderer = Gtk.CellRendererPixbuf()
 
             settings = self.get_settings()
-            w, h = gtk.icon_size_lookup_for_settings(
-                                            settings, gtk.ICON_SIZE_MENU)
+            w, h = Gtk.icon_size_lookup_for_settings(
+                                            settings, Gtk.IconSize.MENU)
             self._icon_renderer.props.stock_size = max(w, h)
 
             self.pack_start(self._icon_renderer, False)
             self.add_attribute(self._icon_renderer, 'pixbuf', 2)
 
         if not self._text_renderer and text:
-            self._text_renderer = gtk.CellRendererText()
+            self._text_renderer = Gtk.CellRendererText()
             self.pack_end(self._text_renderer, True)
             self.add_attribute(self._text_renderer, 'text', 1)
 
         if icon_name or file_name:
             if text:
-                size = gtk.ICON_SIZE_MENU
+                size = Gtk.IconSize.MENU
             else:
-                size = gtk.ICON_SIZE_LARGE_TOOLBAR
-            width, height = gtk.icon_size_lookup(size)
+                size = Gtk.IconSize.LARGE_TOOLBAR
+            width, height = Gtk.icon_size_lookup(size)
 
             if icon_name:
                 file_name = self._get_real_name_from_theme(icon_name, size)
 
-            pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
                                                 file_name, width, height)
         else:
             pixbuf = None
diff --git a/eye.py b/eye.py
index 7b78aad..3d95dff 100644
--- a/eye.py
+++ b/eye.py
@@ -21,15 +21,15 @@
 #     You should have received a copy of the GNU General Public License
 #     along with Speak.activity.  If not, see <http://www.gnu.org/licenses/>.
 
-import pygtk
-import gtk
-import gtk.gdk
+import gi
+from gi.repository import Gtk
+import Gtk.gdk
 import math
 
 
-class Eye(gtk.DrawingArea):
+class Eye(Gtk.DrawingArea):
     def __init__(self, fill_color):
-        gtk.DrawingArea.__init__(self)
+        GObject.GObject.__init__(self)
         self.connect("expose_event", self.expose)
         self.frame = 0
         self.blink = False
@@ -37,8 +37,8 @@ class Eye(gtk.DrawingArea):
         self.fill_color = fill_color
 
         # listen for clicks
-        self.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-        self.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
+        self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
+        self.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
         self.connect("button_press_event", self._mouse_pressed_cb)
         self.connect("button_release_event", self._mouse_released_cb)
 
diff --git a/mouth.py b/mouth.py
index 4d88feb..631189f 100644
--- a/mouth.py
+++ b/mouth.py
@@ -23,16 +23,16 @@
 
 # This code is a super-stripped down version of the waveform view from Measure
 
-import gtk
+from gi.repository import Gtk
 import cairo
 from struct import unpack
 import numpy.core
 
 
-class Mouth(gtk.DrawingArea):
+class Mouth(Gtk.DrawingArea):
     def __init__(self, audioSource, fill_color):
 
-        gtk.DrawingArea.__init__(self)
+        GObject.GObject.__init__(self)
         self.connect("expose_event", self.expose)
         self.buffers = []
         self.buffer_size = 256
diff --git a/roundbox.py b/roundbox.py
index 26e3c84..0fb7307 100644
--- a/roundbox.py
+++ b/roundbox.py
@@ -1,15 +1,15 @@
 import math
-import gtk
+from gi.repository import Gtk
 from sugar3.graphics import style
 
 
-class RoundBox(gtk.HBox):
+class RoundBox(Gtk.HBox):
     __gtype_name__ = 'RoundBox'
 
     _BORDER_DEFAULT = style.LINE_WIDTH
 
     def __init__(self, **kwargs):
-        gtk.HBox.__init__(self, **kwargs)
+        GObject.GObject.__init__(self, **kwargs)
 
         self._x = None
         self._y = None
@@ -20,7 +20,7 @@ class RoundBox(gtk.HBox):
         self.border_color = style.COLOR_BLACK
         self.background_color = None
         self.set_reallocate_redraws(True)
-        self.set_resize_mode(gtk.RESIZE_PARENT)
+        self.set_resize_mode(Gtk.RESIZE_PARENT)
         self.connect("expose_event", self.__expose_cb)
         self.connect("add", self.__add_cb)
 
@@ -74,20 +74,20 @@ class RoundBox(gtk.HBox):
 
 if __name__ == '__main__':
 
-    win = gtk.Window()
-    win.connect('destroy', gtk.main_quit)
+    win = Gtk.Window()
+    win.connect('destroy', Gtk.main_quit)
     win.set_default_size(450, 550)
-    vbox = gtk.VBox()
+    vbox = Gtk.VBox()
 
     box1 = RoundBox()
     vbox.add(box1)
-    label1 = gtk.Label("Test 1")
+    label1 = Gtk.Label(label="Test 1")
     box1.add(label1)
 
     rbox = RoundBox()
     rbox.background_color = style.Color('#FF0000')
     vbox.add(rbox)
-    label2 = gtk.Label("Test 2")
+    label2 = Gtk.Label(label="Test 2")
     rbox.add(label2)
 
     bbox = RoundBox()
@@ -97,4 +97,4 @@ if __name__ == '__main__':
 
     win.add(vbox)
     win.show_all()
-    gtk.main()
+    Gtk.main()
diff --git a/shared_activity.py b/shared_activity.py
index 8161291..c372d7b 100644
--- a/shared_activity.py
+++ b/shared_activity.py
@@ -30,7 +30,7 @@ class SharedActivity(activity.Activity):
         """
         Initialise the Activity.
 
-        canvas -- gtk.Widget
+        canvas -- Gtk.Widget
             root widget for activity content
 
         service -- string
diff --git a/toolitem.py b/toolitem.py
index ba5008b..5a6cf38 100644
--- a/toolitem.py
+++ b/toolitem.py
@@ -17,28 +17,28 @@
 
 """A set of toolitem widets"""
 
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 
 from sugar3.graphics import style
 
 
-class ToolWidget(gtk.ToolItem):
+class ToolWidget(Gtk.ToolItem):
 
     def __init__(self, **kwargs):
         self._widget = None
         self._label = None
         self._label_text = None
-        self._box = gtk.HBox(False, style.DEFAULT_SPACING)
+        self._box = Gtk.HBox(False, style.DEFAULT_SPACING)
 
-        gobject.GObject.__init__(self, **kwargs)
+        GObject.GObject.__init__(self, **kwargs)
         self.props.border_width = style.DEFAULT_PADDING
 
         self._box.show()
         self.add(self._box)
 
         if self.label is None:
-            self.label = gtk.Label()
+            self.label = Gtk.Label()
 
     def get_label_text(self):
         return self._label_text
@@ -48,7 +48,7 @@ class ToolWidget(gtk.ToolItem):
         if self.label is not None and value:
             self.label.set_text(self._label_text)
 
-    label_text = gobject.property(getter=get_label_text, setter=set_label_text)
+    label_text = GObject.property(getter=get_label_text, setter=set_label_text)
 
     def get_label(self):
         return self._label
@@ -62,7 +62,7 @@ class ToolWidget(gtk.ToolItem):
         label.show()
         self.set_label_text(self._label_text)
 
-    label = gobject.property(getter=get_label, setter=set_label)
+    label = GObject.property(getter=get_label, setter=set_label)
 
     def get_widget(self):
         return self._widget
@@ -74,4 +74,4 @@ class ToolWidget(gtk.ToolItem):
         self._box.pack_end(widget)
         widget.show()
 
-    widget = gobject.property(getter=get_widget, setter=set_widget)
+    widget = GObject.property(getter=get_widget, setter=set_widget)