Merge lp:~laney/gdebi/vte2.91 into lp:gdebi

[Iain Lane]

Port to vte 2.91

This isn't urgent because of the gi.require_version, but I'd still like to get everything off the 2.90 gir if possible.

=== modified file 'GDebi/GDebiGtk.py'
--- GDebi/GDebiGtk.py	2014-04-22 12:48:15 +0000
+++ GDebi/GDebiGtk.py	2014-11-18 11:46:15 +0000
@@ -40,7 +40,7 @@
 
 import gi
 gi.require_version("Gtk", "3.0")
-gi.require_version("Vte", "2.90")
+gi.require_version("Vte", "2.91")
 from gi.repository import Gtk
 from gi.repository import GObject
 from gi.repository import GLib
@@ -866,9 +866,8 @@
             self.term_expander.set_expanded(False)
             self.install = install
         def commit(self):
-            def finish_dpkg(term, lock):
+            def finish_dpkg(term, status, lock):
                 """ helper that is run when dpkg finishes """
-                status = term.get_child_exit_status()
                 self.exitstatus = posix.WEXITSTATUS(status)
                 #print "dpkg finished %s %s" % (pid,status)
                 #print "exit status: %s" % self.exitstatus
@@ -922,7 +921,7 @@
 
             # prepare for the fork
             self.term.connect("child-exited", finish_dpkg, lock)
-            (res, pid) =self.term.fork_command_full(
+            (res, pid) =self.term.spawn_sync(
                 Vte.PtyFlags.DEFAULT,
                 "/",
                 argv,
@@ -931,6 +930,7 @@
                 # FIXME: add setup_func that closes all fds excpet for writefd
                 None, #setup_func
                 None, #setup_data
+                None, #cancellable
                 )
             #print "fork_command_full: ", res, pid
 
@@ -1015,7 +1015,7 @@
             # sleep just long enough to not create a busy loop
             time.sleep(0.01)
         def fork(self):
-            pty = Vte.Pty.new(Vte.PtyFlags.DEFAULT)
+            pty = Vte.Pty.new_sync(Vte.PtyFlags.DEFAULT)
             pid = os.fork()
             if pid == 0:
                 # *grumpf* workaround bug in vte here (gnome bug #588871)
@@ -1026,7 +1026,7 @@
                 pty.child_setup()
                 # FIXME: close all fds expect for self.writefd
             else:
-                self.term.set_pty_object(pty)
+                self.term.set_pty(pty)
                 self.term.watch_child(pid)
             return pid
         def wait_child(self):
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-09-29 07:13:24 +0000
+++ debian/changelog	2014-11-18 11:46:15 +0000
@@ -1,3 +1,9 @@
+gdebi (0.9.5.6) UNRELEASED; urgency=medium
+
+  * Use vte 2.91
+
+ -- Iain Lane <[e-mail]>  Tue, 18 Nov 2014 10:54:30 +0000
+
 gdebi (0.9.5.5) unstable; urgency=medium
 
   * Team upload.
 
=== modified file 'debian/control'
--- debian/control	2014-09-29 07:07:27 +0000
+++ debian/control	2014-11-18 11:46:15 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 9),
                dh-python,
                gir1.2-gtk-3.0,
-               gir1.2-vte-2.90,
+               gir1.2-vte-2.91,
                python3-all,
                python3-apt,
                python3-gi,
@@ -44,7 +44,7 @@
          ${misc:Depends},
          gdebi-core (= ${source:Version}),
          gir1.2-gtk-3.0,
-         gir1.2-vte-2.90,
+         gir1.2-vte-2.91,
          python3-gi,
          gksu,
          gnome-icon-theme