From: Steven Luo <steven+maemo@steven676.net>
Date: Fri, 11 Dec 2009 02:09:23 +0000 (-0800)
Subject: Make browser-switchboard launch MicroB if unconfigured and Tear is not installed
X-Git-Tag: v2.2~5
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=f2739d4bfd238bc882e34d918ec3bfe26a47fb9d;hp=e0583c53d0edc5239fafc98f11519f6c630769ce

Make browser-switchboard launch MicroB if unconfigured and Tear is not installed

Make browser-switchboard launch MicroB if there is no config file and
Tear is not installed.  Do this by handling default_browser == ""
specially, and by setting default_browser to the empty string by
default.

This allows us to drop the Depends: on tear in the packaging.
---

diff --git a/browser-switchboard b/browser-switchboard
index 5299cc6..71a9bbf 100755
--- a/browser-switchboard
+++ b/browser-switchboard
@@ -38,12 +38,13 @@ def setconfigdefaults():
     global continuous_mode, default_browser, other_browser_cmd
 
     # continuous_mode: 0 -- close after handling a request; 1 -- run
-    #   continuously in the background
+    # continuously in the background
     continuous_mode = 0
     # default_browser: "tear", "microb", "fennec", "midori", or "other"
-    default_browser = "tear"
+    # empty string is handled specially -- see below
+    default_browser = ""
     # If default browser is "other", what program to run (%s will be replaced
-    #   by URI)
+    # by URI)
     other_browser_cmd = ""
 
 class BrowserLauncher:
@@ -126,6 +127,13 @@ class BrowserLauncher:
             else:
                 print "default_browser is 'other', but no other_browser_cmd set -- using default"
                 self.LaunchBrowser = self.LaunchTear
+        elif default_browser == "":
+            # If default_browser is empty, use Tear as the default if
+            # installed, otherwise use MicroB
+            if os.access("/usr/bin/tear", X_OK):
+                self.LaunchBrowser = self.LaunchTear
+            else
+                self.LaunchBrowser = self.LaunchMicroB
         else:
             print "Unknown default_browser %s, using default" % default_browser
             self.LaunchBrowser = self.LaunchTear