Merge lp:~laney/ubuntu-release-upgrader/port-to-wk2-and-drop-vte-2.90 into lp:ubuntu-release-upgrader

[Iain Lane]

Port to webkit 2 and drop old support for vte 2.90 - it seems the dual support was actually borked.

I didn't give this a test in reality - would be good to do this.

[Brian Murray (brian-murray)]

This was merged and uploaded.

=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
--- DistUpgrade/DistUpgradeViewGtk3.py	2015-10-19 21:10:20 +0000
+++ DistUpgrade/DistUpgradeViewGtk3.py	2016-01-13 17:54:57 +0000
@@ -20,18 +20,9 @@
 #  USA
 
 import gi
+gi.require_version("Vte", "2.91")
+from gi.repository import Vte
 gi.require_version("Gtk", "3.0")
-try:
-    gi.require_version("Vte", "2.91")
-    from gi.repository import Vte
-except Exception as e:
-    gi.require_version("Vte", "2.90")
-    # COMPAT: Dear upstream, this compat code below will be duplicated in
-    #         all python-vte using applications. Love, Michael
-    from gi.repository import Vte
-    Vte.Pty.new_sync = Vte.Pty.new
-
-
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GLib
@@ -365,7 +356,7 @@
         self.term = term
         self.parent = parent
     def call(self, cmd, hidden=False):
-        def wait_for_child(widget):
+        def wait_for_child(terminal, status):
             #print("wait for child finished")
             self.finished=True
         self.term.show()
@@ -411,14 +402,15 @@
     def open(self, url):
         if not self._webkit_view:
             return
-        self._webkit_view.open(url)
-        self._webkit_view.connect("load-finished", self._on_load_finished)
+        self._webkit_view.load_uri(url)
+        self._webkit_view.connect("load-changed", self._on_load_changed)
     def show(self):
         self._webkit_view.show()
     def hide(self):
         self._webkit_view.hide()
-    def _on_load_finished(self, view, frame):
-        view.show()
+    def _on_load_changed(self, view, event, data):
+        if event == WebKit2.LoadEvent.LOAD_FINISHED:
+            view.show()
 
 
 class DistUpgradeViewGtk3(DistUpgradeView,SimpleGtkbuilderApp):
@@ -520,8 +512,8 @@
     def getHtmlView(self):
         if self._webkit_view is None:
             try:
-                from gi.repository import WebKit
-                self._webkit_view = WebKit.WebView()
+                from gi.repository import WebKit2
+                self._webkit_view = WebKit2.WebView()
                 settings = self._webkit_view.get_settings()
                 settings.set_property("enable-plugins", False)
                 self.vbox_main.pack_end(self._webkit_view, True, True, 0)

=== modified file 'DistUpgrade/ReleaseNotesViewerWebkit.py'
--- DistUpgrade/ReleaseNotesViewerWebkit.py	2014-05-02 13:07:42 +0000
+++ DistUpgrade/ReleaseNotesViewerWebkit.py	2016-01-13 17:54:57 +0000
@@ -25,23 +25,31 @@
 #  USA
 
 from gi.repository import Gtk
-from gi.repository import WebKit
+from gi.repository import WebKit2
 
 from .ReleaseNotesViewer import open_url
 
 
-class ReleaseNotesViewerWebkit(WebKit.WebView):
+class ReleaseNotesViewerWebkit(WebKit2.WebView):
     def __init__(self, notes_url):
         super(ReleaseNotesViewerWebkit, self).__init__()
         self.load_uri(notes_url)
-        self.connect("navigation-policy-decision-requested",
-                     self._on_navigation_policy_decision_requested)
-
-    def _on_navigation_policy_decision_requested(self, view, frame, request,
-                                                 action, policy):
-        open_url(request.get_uri())
-        policy.ignore()
-        return True
+        self.connect("decide-policy",
+                     self._on_decide_policy)
+
+    def _on_decide_policy(self, web_view, decision, decision_type):
+        if decision_type == WebKit2.PolicyDecisionType.NAVIGATION_ACTION:
+            navigation_action = decision.get_navigation_action()
+            navigation_request = navigation_action.get_request()
+            navigation_type = navigation_action.get_navigation_type()
+
+            if navigation_type == WebKit2.NavigationType.LINK_CLICKED:
+                uri = navigation_request.get_uri()
+                open_url(uri)
+                decision.ignore()
+                return True
+
+        return False
 
 
 if __name__ == "__main__":
@@ -49,7 +57,7 @@
     win.set_size_request(600, 400)
     scroll = Gtk.ScrolledWindow()
     rv = ReleaseNotesViewerWebkit("http://archive.ubuntu.com/ubuntu/dists/"
-                                  "natty/main/dist-upgrader-all/0.150/"
+                                  "devel/main/dist-upgrader-all/current/"
                                   "ReleaseAnnouncement.html")
     scroll.add(rv)
     win.add(scroll)

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-18 19:20:13 +0000
+++ debian/changelog	2016-01-13 17:54:57 +0000
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:16.04.4) UNRELEASED; urgency=medium
+
+  * Port to WebKit 2
+  * Drop support for legacy vte 2.90
+
+ -- Iain Lane <[e-mail]>  Wed, 13 Jan 2016 13:26:25 +0000
+
 ubuntu-release-upgrader (1:16.04.3) xenial; urgency=medium
 
   * DistUpgrade/DistUpgradeController.py: if a BaseMetaPkg has no origins,

=== modified file 'debian/control'
--- debian/control	2015-09-29 17:05:45 +0000
+++ debian/control	2016-01-13 17:54:57 +0000
@@ -58,7 +58,7 @@
          python3-gi (>= 3.8),
          gir1.2-vte-2.91,
          gir1.2-gtk-3.0,
-         gir1.2-webkit-3.0
+         gir1.2-webkit2-4.0
 Description: manage release upgrades
  This is the GTK+ frontend of the Ubuntu Release Upgrader