Try legacy config file location if config file not found

[browser-switch] / launcher.c

diff --git a/launcher.c b/launcher.c
index d9fa584..e77e965 100644 (file)
--- a/launcher.c
+++ b/launcher.c
@@ -32,6 +32,7 @@
 #include "launcher.h"
 #include "dbus-server-bindings.h"
 
+#define DEFAULT_BROWSER "/usr/bin/tear"
 #define LAUNCH_DEFAULT_BROWSER launch_tear
 
 static void launch_tear(struct swb_context *ctx, char *uri) {
@@ -154,7 +155,7 @@ static void launch_other_browser(struct swb_context *ctx, char *uri) {
 
                        /* Move the string after the ', including the \0,
                           over two chars */
-                       memmove(quote+3, quote+1, strlen(quote)+1);
+                       memmove(quote+3, quote+1, strlen(quote));
                        memcpy(quote, "%27", 3);
                        quote = quote + 3;
                }
@@ -206,7 +207,12 @@ void update_default_browser(struct swb_context *ctx, char *default_browser) {
                return;
 
        if (!default_browser) {
-               ctx->default_browser_launcher = LAUNCH_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;
                return;
        }