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

[Iain Lane]

Port to the new vte-2.91 API

[Iain Lane (laney)]

In the absence of this being merged + uploaded, the install will probably error out. gi is going to try and use 2.91 if gir1.2-vte-2.91 is installed, and the old code is not compatible.

If you don't have time to review, you could upload with this change to force 2.90 in the meantime.

"import gi
gi.require_version ("Vte", "2.90")"

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-29 12:33:49 +0000
+++ debian/changelog	2014-11-10 17:54:21 +0000
@@ -1,9 +1,13 @@
 ubiquity (2.21.0) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Go forward rather than back in response to partman-crypto/passphrase and
     partman-crypto/passphrase-again questions if the UI is not available but
     they have been preseeded (LP: #1386113).
 
+  [ Iain Lane ]
+  * Port the Vte widget to use the 2.91 API.
+
  -- Colin Watson <[e-mail]>  Wed, 29 Oct 2014 12:32:44 +0000
 
 ubiquity (2.20.0) utopic; urgency=medium

=== modified file 'debian/control'
--- debian/control	2014-07-22 13:54:51 +0000
+++ debian/control	2014-11-10 17:54:21 +0000
@@ -45,7 +45,7 @@
 Package: ubiquity-frontend-gtk
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-soup-2.4, gir1.2-vte-2.90, gir1.2-webkit-3.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit-3.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
 Suggests: gnome-control-center | feh
 Conflicts: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 Replaces: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2014-06-30 13:09:16 +0000
+++ ubiquity/frontend/gtk_ui.py	2014-11-10 17:54:21 +0000
@@ -901,15 +901,18 @@
             style.add_class('menubar')
 
         # TODO lazy load
-        from gi.repository import Vte
+        import gi
+        gi.require_version("Vte", "2.91")
+        from gi.repository import Vte, Pango
         self.vte = Vte.Terminal()
         self.install_details_sw.add(self.vte)
         tail_cmd = [
             '/bin/busybox', 'tail', '-f', '/var/log/installer/debug',
             '-f', '/var/log/syslog', '-q',
         ]
-        self.vte.fork_command_full(0, None, tail_cmd, None, 0, None, None)
-        self.vte.set_font_from_string("Ubuntu Mono 8")
+        self.vte.spawn_sync(0, None, tail_cmd, None, 0, None, None, None)
+        fontdesc = Pango.font_description_from_string("Ubuntu Mono 8")
+        self.vte.set_font(fontdesc)
         self.vte.show()
         # FIXME shrink the window horizontally instead of locking the window
         # size.