Merge ubiquity:wip/launch-browser-properly into ubiquity:master

[Iain Lane]

[Dimitri John Ledkov (xnox)]

review: Approve

diff --git a/ubiquity/misc.py b/ubiquity/misc.py
index c94fee8..c0b0536 100644
--- a/ubiquity/misc.py
+++ b/ubiquity/misc.py
@@ -906,4 +906,9 @@ def install_size():
 
 min_install_size = None
 
+
+def launch_uri(uri):
+    subprocess.Popen(['sensible-browser', uri], close_fds=True,
+                     preexec_fn=drop_all_privileges)
+
 # vim:ai:et:sts=4:tw=80:sw=4:
diff --git a/ubiquity/plugins/ubi-language.py b/ubiquity/plugins/ubi-language.py
index 19c979d..87ee02d 100644
--- a/ubiquity/plugins/ubi-language.py
+++ b/ubiquity/plugins/ubi-language.py
@@ -373,10 +373,8 @@ class PageGtk(PageBase):
                     self.release_notes_label.hide()
             self.updating_installer = False
         elif uri == 'release-notes':
-            import subprocess
             uri = self.release_notes_url.replace('${LANG}', lang)
-            subprocess.Popen(['sensible-browser', uri], close_fds=True,
-                             preexec_fn=misc.drop_all_privileges)
+            misc.launch_uri(uri)
         return True
 
 
diff --git a/ubiquity/plugins/ubi-partman.py b/ubiquity/plugins/ubi-partman.py
index d2bd01d..68a1140 100644
--- a/ubiquity/plugins/ubi-partman.py
+++ b/ubiquity/plugins/ubi-partman.py
@@ -136,6 +136,8 @@ class PageGtk(PageBase):
         self.page_auto = builder.get_object('stepPartAuto')
         self.page_advanced = builder.get_object('stepPartAdvanced')
         self.page_crypto = builder.get_object('stepPartCrypto')
+        self.bitlocker_label = builder.get_object('label_using_bitlocker')
+        self.bitlocker_label.connect('activate-link', self.on_link_clicked)
 
         # Get all objects + add internal child(s)
         all_widgets = builder.get_object_ids()
@@ -208,6 +210,9 @@ class PageGtk(PageBase):
         # Define a list to save grub imformation
         self.grub_options = []
 
+    def on_link_clicked(self, widget, uri):
+        misc.launch_uri(uri)
+
     def update_branded_strings(self):
         release = misc.get_release()
 
diff --git a/ubiquity/plugins/ubi-prepare.py b/ubiquity/plugins/ubi-prepare.py
index 1e17587..af3b4d0 100644
--- a/ubiquity/plugins/ubi-prepare.py
+++ b/ubiquity/plugins/ubi-prepare.py
@@ -123,11 +123,16 @@ class PageGtk(PreparePageBase):
         self.prepare_page = builder.get_object('stepPrepare')
         self.insufficient_space_page = builder.get_object('stepNoSpace')
         self.rst_page = builder.get_object('stepRST')
+        self.rst_label = builder.get_object('label_using_rst')
+        self.rst_label.connect('activate-link', self.on_link_clicked)
         self.current_page = self.prepare_page
         self.plugin_widgets = self.prepare_page
         self.plugin_optional_widgets = [self.insufficient_space_page,
                                         self.rst_page]
 
+    def on_link_clicked(self, widget, uri):
+        misc.launch_uri(uri)
+
     def plugin_get_current_page(self):
         return self.current_page