From: Steven Luo <steven+maemo@steven676.net>
Date: Fri, 11 Dec 2009 02:18:54 +0000 (-0800)
Subject: Merge branch 'master' into diablo-package
X-Git-Tag: diablo-package-2.2-1~7
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=78273551a663299cf1cc10287d8a35b056954e79;hp=848751e124943562aab29c19fd4b08dc5d06ec2f

Merge branch 'master' into diablo-package
---

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