X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=dbus-server-bindings.c;h=f20a6901fa79f525196f42d3e94b90233545f9ba;hp=939056b87824910fe95c99eee6625907dfccd9df;hb=7bfa2858f0a4c938bf4c9ad205f67e96052aff6e;hpb=6a0bbbe4e737de30b850e617738cd4c8e363ba69

diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c
index 939056b..f20a690 100644
--- a/dbus-server-bindings.c
+++ b/dbus-server-bindings.c
@@ -1,7 +1,7 @@
 /*
  * dbus-server-bindings.c -- osso_browser D-Bus interface implementation
  *
- * 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
@@ -23,11 +23,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <signal.h>
 #include <dbus/dbus-glib.h>
 
 #include "browser-switchboard.h"
 #include "launcher.h"
 #include "dbus-server-bindings.h"
+#include "log.h"
 
 extern struct swb_context ctx;
 
@@ -43,6 +45,21 @@ static void osso_browser_class_init(OssoBrowserClass *klass)
 #include "dbus-server-glue.h"
 
 
+/* Ignore reconfiguration signal (SIGHUP)
+   When not running in continuous mode, no SIGHUP handler is installed, which
+   causes browser-switchboard to quit on a reconfig request.  This is normally
+   what we want -- but if we're already in the process of dispatching a
+   request, we'll quit anyway after finishing what we're doing, so ignoring the
+   signal is the right thing to do. */
+static void ignore_reconfig_requests(void) {
+	struct sigaction act;
+
+	act.sa_flags = SA_RESTART;
+	sigemptyset(&(act.sa_mask));
+	act.sa_handler = SIG_IGN;
+	sigaction(SIGHUP, &act, NULL);
+}
+
 static void open_address(const char *uri) {
 	char *new_uri;
 	size_t new_uri_len;
@@ -51,7 +68,7 @@ static void open_address(const char *uri) {
 		/* Not much to do in this case ... */
 		return;
 
-	printf("open_address '%s'\n", uri);
+	log_msg("open_address '%s'\n", uri);
 	if (uri[0] == '/') {
 		/* URI begins with a '/' -- assume it points to a local file
 		   and prefix with "file://" */
@@ -65,6 +82,15 @@ static void open_address(const char *uri) {
 		   we need to clean up after ourselves */
 		free(new_uri);
 	} else {
+#ifdef FREMANTLE
+		if (!strcmp(uri, "http://link.ovi.mobi/n900ovistore")) {
+			/* Ovi Store webpage will not open correctly in
+			   any browser other than MicroB, so force the
+			   link in the provided bookmark to open in MicroB */
+			launch_microb(&ctx, (char *)uri);
+			return;
+		}
+#endif
 		launch_browser(&ctx, (char *)uri);
 	}
 }
@@ -75,32 +101,42 @@ static void open_address(const char *uri) {
  */
 gboolean osso_browser_load_url(OssoBrowser *obj,
 		const char *uri, GError **error) {
+	if (!ctx.continuous_mode)
+		ignore_reconfig_requests();
 	open_address(uri);
 	return TRUE;
 }
 
 gboolean osso_browser_mime_open(OssoBrowser *obj,
 		const char *uri, GError **error) {
+	if (!ctx.continuous_mode)
+		ignore_reconfig_requests();
 	open_address(uri);
 	return TRUE;
 }
 
 gboolean osso_browser_open_new_window(OssoBrowser *obj,
 		const char *uri, GError **error) {
+	if (!ctx.continuous_mode)
+		ignore_reconfig_requests();
 	open_address(uri);
 	return TRUE;
 }
 
 gboolean osso_browser_top_application(OssoBrowser *obj,
 		GError **error) {
-	launch_microb(&ctx, "new_window");
+	if (!ctx.continuous_mode)
+		ignore_reconfig_requests();
+	launch_browser(&ctx, "new_window");
 	return TRUE;
 }
 
 /* This is a "undocumented", non-standard extension to the API, ONLY
-   for use by /usr/bin/browser wrapper to implement --url */
+   for use by /usr/bin/microb wrapper */
 gboolean osso_browser_switchboard_launch_microb(OssoBrowser *obj,
 		const char *uri, GError **error) {
+	if (!ctx.continuous_mode)
+		ignore_reconfig_requests();
 	launch_microb(&ctx, (char *)uri);
 	return TRUE;
 }
@@ -120,11 +156,11 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
 			       G_TYPE_INVALID,
 			       G_TYPE_UINT, &result,
 			       G_TYPE_INVALID)) {
-		printf("Couldn't acquire name com.nokia.osso_browser\n");
+		log_msg("Couldn't acquire name com.nokia.osso_browser\n");
 		exit(1);
 	}
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {	
-		printf("Couldn't acquire name com.nokia.osso_browser\n");
+		log_msg("Couldn't acquire name com.nokia.osso_browser\n");
 		exit(1);
 	}
 }