[ontv] Stop using deprecated reaper object

[Olof Kindgren <olki src gnome org>]

commit aaec9feb06f30b7a1f049f16010305281ca662b2
Author: Olof Kindgren <olki src gnome org>
Date:   Wed Feb 2 23:04:55 2011 +0100

    Stop using deprecated reaper object
    
    The reaper object is deprecated and has been removed in recent python vte
    bindings. Use get_child_exit_status() instead. Fixes bgo#636354

 ontv/assistant.py |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/ontv/assistant.py b/ontv/assistant.py
index 8c8a519..5b12406 100644
--- a/ontv/assistant.py
+++ b/ontv/assistant.py
@@ -328,9 +328,8 @@ class XMLTVAssistant(gtk.Assistant):
         page = self.get_nth_page(page_number)
 
         if self.__previous_page == page_number + 1:
-            reaper = vte.reaper_get()
-            if reaper.handler_is_connected(self.id):
-                reaper.disconnect(self.id)
+            if self.terminal.handler_is_connected(self.id):
+                self.terminal.disconnect(self.id)
 
         if page_number == 1:
             if self.installed_button.get_active() and self.country:
@@ -349,8 +348,7 @@ class XMLTVAssistant(gtk.Assistant):
                     self.__setup_terminal()
 
                 self.terminal.reset(full=True, clear_history=True)
-                reaper = vte.reaper_get()
-                self.id = reaper.connect("child-exited", self.__terminal_exited,
+                self.id = self.terminal.connect("child-exited", self.__terminal_exited,
                                          page)
                 grabber = self.grabber_command.split()[0]
                 configure_command = [grabber, "--configure", "--quiet"]
@@ -374,8 +372,7 @@ class XMLTVAssistant(gtk.Assistant):
             self.terminal.reset(full=True, clear_history=True)
             id = gobject.timeout_add(250, self.__pulse_progressbar,
                                      self.progressbar)
-            reaper = vte.reaper_get()
-            self.id = reaper.connect("child-exited",
+            self.id = self.terminal.connect("child-exited",
                                      self.__grabber_command_exited,
                                      (self.progressbar, id, page))
 
@@ -410,21 +407,22 @@ class XMLTVAssistant(gtk.Assistant):
         return grabber_command
 
 
-    def __terminal_exited(self, reaper, pid, status, page):
-        if reaper.handler_is_connected(self.id):
-            reaper.disconnect(self.id)
-        if status == 0:
+    def __terminal_exited(self, term, page):
+        if term.handler_is_connected(self.id):
+            term.disconnect(self.id)
+        if term.get_child_exit_status() == 0:
             self.set_page_complete(page, True)
 
     def __pulse_progressbar(self, progressbar):
         progressbar.pulse()
         return True
 
-    def __grabber_command_exited(self, reaper, pid, status, (progressbar, id,
+    def __grabber_command_exited(self, term, (progressbar, id,
                                                               page)):
-        if reaper.handler_is_connected(self.id):
-            reaper.disconnect(self.id)
+        if term.handler_is_connected(self.id):
+            term.disconnect(self.id)
 
+        status = term.get_child_exit_status()
         if os.WEXITSTATUS(status) != 0:
             gobject.source_remove(id)
             progressbar.modify_fg(gtk.STATE_NORMAL,
@@ -441,8 +439,7 @@ class XMLTVAssistant(gtk.Assistant):
             arguments = self.grabber_command.split()
             sort_command = "tv_sort %s --output %s" % (self.xmltvfile_path,
                                                        self.xmltvfile_path)
-            reaper = vte.reaper_get()
-            self.id = reaper.connect("child-exited",
+            self.id = self.terminal.connect("child-exited",
                                      self.__sort_command_exited,
                                      (self.progressbar, id, page))
             pid = self.terminal.fork_command(sort_command.split()[0],
@@ -451,10 +448,10 @@ class XMLTVAssistant(gtk.Assistant):
         else:
             self.__set_page_4_done(progressbar, id, page)
 
-    def __sort_command_exited(self, reaper, pid, status, (progressbar, id,
+    def __sort_command_exited(self, term, (progressbar, id,
                                                           page)):
-        if reaper.handler_is_connected(self.id):
-            reaper.disconnect(self.id)
+        if term.handler_is_connected(self.id):
+            term.disconnect(self.id)
 
         self.xmltvfile.props.path = self.xmltvfile_path
         self.xmltvfile.load()