Merge lp:~roadmr/checkbox/925603 into lp:checkbox

[Daniel Manrique]

Fixes the linked bug with a way of retrieving the user's preferred browser in a way that works better with Gnome3. The actual culprit is the Chromium package which assumes the user *wants* it as the default browser and configures itself in /etc/alternatives, which doesn't match up with Gnome's way of configuring the default browser.

[Marc Tardif (cr3)]

Ugh, thanks!

review: Approve

=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2011-12-15 15:55:25 +0000
+++ checkbox/user_interface.py	2012-02-06 20:08:46 +0000
@@ -1,7 +1,7 @@
 #
 # This file is part of Checkbox.
 #
-# Copyright 2008 Canonical Ltd.
+# Copyright 2008-2012 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@
 import gettext
 from gettext import gettext as _
 
+from gi.repository import Gio
+
 from checkbox.contrib.REThread import REThread
 
 from checkbox.lib.environ import add_variable, get_variable, remove_variable
@@ -177,11 +179,9 @@
                 if os.getenv("DISPLAY") and \
                         subprocess.call(["pgrep", "-x", "-u", str(uid), "gnome-panel|gconfd-2"],
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0:
-                    gct = subprocess.Popen(sudo_prefix + ["gconftool", "--get",
-                        "/desktop/gnome/url-handlers/http/command"],
-                        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                    if gct.wait() == 0:
-                        preferred_browser = gct.communicate()[0]
+                    preferred_xml_app = Gio.app_info_get_default_for_type("application/xml",False)
+                    if preferred_xml_app:
+                        preferred_browser = preferred_xml_app.get_executable()
                         browser = re.match("((firefox|seamonkey|flock)[^\s]*)", preferred_browser)
                         if browser:
                             subprocess.call(sudo_prefix + [browser.group(0), "-new-window", url])
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-02-03 23:08:37 +0000
+++ debian/changelog	2012-02-06 20:08:46 +0000
@@ -9,7 +9,12 @@
   * Removed trailing directories from the devpath of disk devices (LP: #925582)
   * Fixed awk regular expression in max_diskspace_used script (LP: #926312)
 
- -- Marc Tardif <[e-mail]>  Fri, 03 Feb 2012 15:23:06 -0500
+  [Daniel Manrique]
+  * Changed way of obtaining preferred browser to ensure we honor the user's
+    preference rather than Chromium's clobbering of
+    /etc/alternatives/gnome-www-browser (LP: #925603) 
+
+ -- Daniel Manrique <[e-mail]>  Mon, 06 Feb 2012 14:55:58 -0500
 
 checkbox (0.13.1) precise; urgency=low