X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=launcher.c;h=02bc3eb4b549867f90d168f86bcd9aec160b6fb6;hp=76a532105588e29861812c554fc1459bab99d0a1;hb=5b7e4808269f8247a7d147b387007e5d15e0d7c8;hpb=3daedfe0947a34de6fea7378a10b166ddb934f98

diff --git a/launcher.c b/launcher.c
index 76a5321..02bc3eb 100644
--- a/launcher.c
+++ b/launcher.c
@@ -1,7 +1,7 @@
 /*
  * launcher.c -- functions for launching web browsers for browser-switchboard
  *
- * Copyright (C) 2009 Steven Luo
+ * Copyright (C) 2009-2010 Steven Luo
  * Derived from a Python implementation by Jason Simpson and Steven Luo
  *
  * This program is free software; you can redistribute it and/or
@@ -190,13 +190,13 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 	printf("launch_microb with uri '%s'\n", uri);
 
 	/* Launch browserd if it's not running */
-	status = system("pidof /usr/sbin/browserd > /dev/null");
+	status = system("pidof browserd > /dev/null");
 	if (WIFEXITED(status) && WEXITSTATUS(status)) {
 		kill_browserd = 1;
 #ifdef FREMANTLE
-		system("/usr/sbin/browserd -d -b");
+		system("/usr/sbin/browserd -d -b > /dev/null 2>&1");
 #else
-		system("/usr/sbin/browserd -d");
+		system("/usr/sbin/browserd -d > /dev/null 2>&1");
 #endif
 	}
 
@@ -419,7 +419,7 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 
 	/* Kill off browserd if we started it */
 	if (kill_browserd)
-		system("kill `pidof /usr/sbin/browserd`");
+		system("kill `pidof browserd`");
 
 	if (!ctx || !ctx->continuous_mode) 
 		exit(0);