X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=launcher.c;h=6a70c8250d6530f161ffe4d7cc5760a6d9c6bc5e;hp=02bc3eb4b549867f90d168f86bcd9aec160b6fb6;hb=88db94294d5f27f30d2fa30f9cb90c122f36b176;hpb=5b7e4808269f8247a7d147b387007e5d15e0d7c8

diff --git a/launcher.c b/launcher.c
index 02bc3eb..6a70c82 100644
--- a/launcher.c
+++ b/launcher.c
@@ -32,6 +32,7 @@
 
 #ifdef FREMANTLE
 #include <dbus/dbus.h>
+#include <signal.h>
 #endif
 
 #include "browser-switchboard.h"
@@ -307,6 +308,7 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 				exit(1);
 			}
 		}
+		g_object_unref(g_proxy);
 
 		/* Workaround: the browser process we started is going to want
 		   to hang around forever, hogging the com.nokia.osso_browser
@@ -370,20 +372,10 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 		dbus_connection_close(raw_connection);
 		dbus_connection_unref(raw_connection);
 
-		/* Tell browser UI to exit nicely */
-		printf("Closing MicroB\n");
-		if (!dbus_g_proxy_call(g_proxy, "exit_browser", &gerror,
-				       G_TYPE_INVALID, G_TYPE_INVALID)) {
-			/* We don't expect a reply; any other error indicates
-			   a problem */
-			if (gerror->domain != DBUS_GERROR ||
-			    gerror->code != DBUS_GERROR_NO_REPLY) {
-				printf("exit_browser failed: %s\n",
-				       gerror->message);
-				exit(1);
-			}
-		}
-		g_object_unref(g_proxy);
+		/* Kill off browser UI
+		   XXX: Hope we don't cause data loss here! */
+		printf("Killing MicroB\n");
+		kill(pid, SIGTERM);
 	} else {
 		/* Child process */
 		close_stdio();