From: Steven Luo <steven+maemo@steven676.net>
Date: Fri, 5 Feb 2010 12:32:01 +0000 (-0800)
Subject: Make sure a running browserd is detected correctly on all devices
X-Git-Tag: fremantle-package-3.1-2fremantle2~2
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=aea8af77e9b8614776a3be05a4dff86ea25063f6

Make sure a running browserd is detected correctly on all devices

`pidof /usr/sbin/browserd` doesn't work on at least one user's device;
`pidof browserd` works everywhere without exception, so use that
instead.

Reported by Faheem Pervez (qwerty12).
---

diff --git a/launcher.c b/launcher.c
index feef231..6759813 100644
--- a/launcher.c
+++ b/launcher.c
@@ -179,7 +179,7 @@ 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
@@ -408,7 +408,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);