From 2a07c1c82bf35b1c520ff662c8ed40b6b65a8582 Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Fri, 18 Dec 2009 02:40:00 -0800 Subject: [PATCH] Default to launching MicroB if default_browser is unset The check-for-Tear-and-use-MicroB-otherwise hack was only until we got a config UI. Now that we have one, it's easiest just to keep MicroB as the default until the user configures browser-switchboard. --- launcher.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/launcher.c b/launcher.c index 6f25a28..a2aec71 100644 --- a/launcher.c +++ b/launcher.c @@ -32,8 +32,7 @@ #include "launcher.h" #include "dbus-server-bindings.h" -#define DEFAULT_BROWSER "/usr/bin/tear" -#define LAUNCH_DEFAULT_BROWSER launch_tear +#define LAUNCH_DEFAULT_BROWSER launch_microb static void launch_tear(struct swb_context *ctx, char *uri) { int status; @@ -227,12 +226,8 @@ void update_default_browser(struct swb_context *ctx, char *default_browser) { return; if (!default_browser) { - /* No default_browser configured -- use DEFAULT_BROWSER if - installed, otherwise launch MicroB */ - if (!access(DEFAULT_BROWSER, X_OK)) - ctx->default_browser_launcher = LAUNCH_DEFAULT_BROWSER; - else - ctx->default_browser_launcher = launch_microb; + /* No default_browser configured -- use built-in default */ + ctx->default_browser_launcher = LAUNCH_DEFAULT_BROWSER; return; } -- 1.7.9.5