diff --git a/examples/iconwidget.py b/examples/iconwidget.py
index e4d7f26e..0be9f42c 100644
--- a/examples/iconwidget.py
+++ b/examples/iconwidget.py
@@ -80,8 +80,8 @@ test.show()
 #    test.queue_draw()
 #    return True
 #
-#from gi.repository import GObject
-#GObject.idle_add(idle_cb)
+#from gi.repository import GLib
+#GLib.idle_add(idle_cb)
 
 if __name__ == '__main__':
     common.main(test)
diff --git a/src/sugar3/graphics/alert.py b/src/sugar3/graphics/alert.py
index 6d009248..d1dc79b6 100644
--- a/src/sugar3/graphics/alert.py
+++ b/src/sugar3/graphics/alert.py
@@ -434,7 +434,7 @@ class TimeoutAlert(Alert):
         self.add_button(Gtk.ResponseType.OK, _('Continue'), self._timeout_text)
         self._timeout_text.show()
 
-        GObject.timeout_add_seconds(1, self.__timeout)
+        GLib.timeout_add_seconds(1, self.__timeout)
 
     def __timeout(self):
         self._timeout -= 1
@@ -479,7 +479,7 @@ class NotifyAlert(Alert):
         self.add_button(Gtk.ResponseType.OK, _('Ok'), self._timeout_text)
         self._timeout_text.show()
 
-        GObject.timeout_add(1000, self.__timeout)
+        GLib.timeout_add(1000, self.__timeout)
 
     def __timeout(self):
         self._timeout -= 1
diff --git a/src/sugar3/graphics/animator.py b/src/sugar3/graphics/animator.py
index de594043..7af16493 100644
--- a/src/sugar3/graphics/animator.py
+++ b/src/sugar3/graphics/animator.py
@@ -22,6 +22,7 @@ STABLE.
 import time
 
 from gi.repository import GObject
+from gi.repository import GLib
 
 EASE_OUT_EXPO = 0
 EASE_IN_EXPO = 1
@@ -54,7 +55,7 @@ class Animator(GObject.GObject):
             self.stop()
 
         self._start_time = time.time()
-        self._timeout_sid = GObject.timeout_add(
+        self._timeout_sid = GLib.timeout_add(
                     int(self._interval * 1000), self._next_frame_cb)
 
     def stop(self):
diff --git a/src/sugar3/graphics/palettewindow.py b/src/sugar3/graphics/palettewindow.py
index 5483ca1a..10111694 100644
--- a/src/sugar3/graphics/palettewindow.py
+++ b/src/sugar3/graphics/palettewindow.py
@@ -29,6 +29,7 @@ import math
 from gi.repository import Gdk
 from gi.repository import Gtk
 from gi.repository import GObject
+from gi.repository import GLib
 
 from gi.repository import SugarGestures
 from sugar3.graphics import palettegroup
@@ -429,7 +430,7 @@ class MouseSpeedDetector(GObject.GObject):
         self.stop()
 
         self._mouse_pos = self._get_mouse_position()
-        self._timeout_hid = GObject.timeout_add(self._delay, self._timer_cb)
+        self._timeout_hid = GLib.timeout_add(self._delay, self._timer_cb)
 
     def stop(self):
         if self._timeout_hid is not None:
diff --git a/src/sugar3/graphics/window.py b/src/sugar3/graphics/window.py
index a22922de..fc597dc3 100644
--- a/src/sugar3/graphics/window.py
+++ b/src/sugar3/graphics/window.py
@@ -21,6 +21,7 @@ STABLE.
 """
 
 from gi.repository import GObject
+from gi.repository import GLib
 from gi.repository import Gdk
 from gi.repository import GdkX11
 from gi.repository import Gtk
@@ -161,7 +162,7 @@ class Window(Gtk.Window):
                 self._unfullscreen_button_timeout_id = None
 
             self._unfullscreen_button_timeout_id = \
-                GObject.timeout_add_seconds( \
+                GLib.timeout_add_seconds( \
                     _UNFULLSCREEN_BUTTON_VISIBILITY_TIMEOUT, \
                     self.__unfullscreen_button_timeout_cb)
 
@@ -285,7 +286,7 @@ class Window(Gtk.Window):
                 self._unfullscreen_button_timeout_id = None
 
             self._unfullscreen_button_timeout_id = \
-                GObject.timeout_add_seconds( \
+                GLib.timeout_add_seconds( \
                     _UNFULLSCREEN_BUTTON_VISIBILITY_TIMEOUT, \
                     self.__unfullscreen_button_timeout_cb)
 
diff --git a/tests/graphics/progressicon.py b/tests/graphics/progressicon.py
index 9a91a9e7..a922749c 100644
--- a/tests/graphics/progressicon.py
+++ b/tests/graphics/progressicon.py
@@ -20,7 +20,7 @@ Test the sugar3.graphics.progressicon.ProgressIcon widget.
 """
 
 
-from gi.repository import GObject
+from gi.repository import GLib
 
 from sugar3.graphics.progressicon import ProgressIcon
 from sugar3.graphics import style
@@ -59,7 +59,7 @@ def timeout_cb():
         return False
     return True
 
-GObject.timeout_add(50, timeout_cb)
+GLib.timeout_add(50, timeout_cb)
 
 if __name__ == '__main__':
     common.main(test)