Revert "Kill MicroB browser UI processes instead of using exit_browser"

[browser-switch] / launcher.c

diff --git a/launcher.c b/launcher.c
index 93cce2f..6759813 100644 (file)
--- a/launcher.c
+++ b/launcher.c
@@ -179,13 +179,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 */
        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
        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
 #else

-               system("/usr/sbin/browserd -d");
+               system("/usr/sbin/browserd -d > /dev/null 2>&1");

 #endif
        }
 
 #endif
        }
 

@@ -408,7 +408,7 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 
        /* Kill off browserd if we started it */
        if (kill_browserd)
 
        /* 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);
 
        if (!ctx || !ctx->continuous_mode) 
                exit(0);