From: Boris Bobrov <breton@cynicmansion.ru>
Date: Mon, 25 Jul 2016 00:39:23 +0000 (+0300)
Subject: Use GLib instead of GObject
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c12a97b084e7ee7b805642ad186683ca30091744;p=mediagoblin.git

Use GLib instead of GObject

Thanks mi!

Fixes bug 5399
---

diff --git a/AUTHORS b/AUTHORS
index f7ee02db..a4435c32 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,6 +76,7 @@ Thank you!
 * Matt Lee
 * Matt Molyneaux
 * Meg Ford
+* mi
 * Michele Azzolari
 * Mike Linksvayer
 * Natalie Foust-Pilcher
diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py
index f4b0341e..2d3392f2 100644
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@ -31,7 +31,7 @@ sys.argv = []
 
 import gi
 gi.require_version('Gst', '1.0')
-from gi.repository import GObject, Gst
+from gi.repository import GLib, Gst
 Gst.init(None)
 # init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260
 from gi.repository import GstPbutils
@@ -154,7 +154,7 @@ class VideoTranscoder(object):
     def __init__(self):
         _log.info('Initializing VideoTranscoder...')
         self.progress_percentage = None
-        self.loop = GObject.MainLoop()
+        self.loop = GLib.MainLoop()
 
     def transcode(self, src, dst, **kwargs):
         '''
@@ -371,11 +371,11 @@ class VideoTranscoder(object):
             self.pipeline.set_state(Gst.State.NULL)
 
         # This kills the loop, mercifully
-        GObject.idle_add(self.__stop_mainloop)
+        GLib.idle_add(self.__stop_mainloop)
 
     def __stop_mainloop(self):
         '''
-        Wrapper for GObject.MainLoop.quit()
+        Wrapper for GLib.MainLoop.quit()
 
         This wrapper makes us able to see if self.loop.quit has been called
         '''