releasing package apturl version 0.5.2ubuntu110.5.2ubuntu11

3 files changed, 10 insertions, 17 deletions

diff --git a/AptUrl/gtk/GtkUI.py b/AptUrl/gtk/GtkUI.py
index ff54878..3a0b3ec 100644
--- a/AptUrl/gtk/GtkUI.py
+++ b/AptUrl/gtk/GtkUI.py
@@ -80,17 +80,7 @@ class GtkUI(AbstractUI):
 return False
 return True
 
- def _add_webkit1_view(self, html, d):
- from gi.repository import WebKit
- v = WebKit.WebView()
- v.load_string(html, "text/html", "utf-8", "file:/")
- sw = Gtk.ScrolledWindow()
- sw.add(v)
- d.get_content_area().pack_start(sw, True, True, 0)
- sw.set_size_request(400, 200)
- sw.show_all()
-
- def _add_webkit2_view(self, html, d):
+ def _add_webkit_view(self, html, d):
 from gi.repository import WebKit2
 v = WebKit2.WebView()
 v.load_html(html, "file:/")
@@ -107,12 +97,9 @@ class GtkUI(AbstractUI):
 buttons=Gtk.ButtonsType.YES_NO)
 if channel_info_html:
 try:
- self._add_webkit2_view(channel_info_html, d)
+ self._add_webkit_view(channel_info_html, d)
 except ImportError:
- try:
- self._add_webkit1_view(channel_info_html, d)
- except ImportError:
- pass
+ pass
 res = d.run()
 d.destroy()
 if res != Gtk.ResponseType.YES:
diff --git a/debian/changelog b/debian/changelog
index cd10b0f..96d0f8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apturl (0.5.2ubuntu11) xenial; urgency=medium
+
+ * Drop webkit1 support, we're switching to pure webkit2 now
+
+ -- Iain Lane <iain@orangesquash.org.uk> Wed, 13 Jan 2016 11:48:22 +0000
+
 apturl (0.5.2ubuntu10) xenial; urgency=medium
 
 * debian/apturl.install:
diff --git a/debian/control b/debian/control
index 62c45e8..7f1983a 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Depends: ${python3:Depends},
 python3-aptdaemon,
 python3-aptdaemon.gtk3widgets,
 gir1.2-gtk-3.0,
- gir1.2-webkit2-4.0 | gir1.2-webkit-3.0
+ gir1.2-webkit2-4.0
 Suggests: libgtk2-perl (>= 1:1.130)
 Description: install packages using the apt protocol - GTK+ frontend
 AptUrl is a simple graphical application that takes an URL (which follows the