/*
* 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
#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;
#include "dbus-server-glue.h"
-static void open_address(const char * uri) {
- char * new_uri;
+/* 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;
- if (!uri && uri[0] == '/') {
+ if (!uri)
+ /* Not much to do in this case ... */
+ return;
+
+ 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://" */
new_uri_len = strlen("file://") + strlen(uri) + 1;
if (!(new_uri = calloc(new_uri_len, sizeof(char))))
exit(1);
- strncpy(new_uri, "file://", strlen("file://"));
- strncat(new_uri, uri, strlen(uri));
+ snprintf(new_uri, new_uri_len, "%s%s", "file://", uri);
launch_browser(&ctx, new_uri);
/* If launch_browser didn't exec something in this process,
we need to clean up after ourselves */
free(new_uri);
} else {
- printf("open_address '%s'\n", uri);
+#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);
}
}
* The com.nokia.osso_browser D-Bus interface
*/
gboolean osso_browser_load_url(OssoBrowser *obj,
- const char * uri, GError **error) {
+ 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) {
+ 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) {
+ 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) {
+ const char *uri, GError **error) {
+ if (!ctx.continuous_mode)
+ ignore_reconfig_requests();
launch_microb(&ctx, (char *)uri);
return TRUE;
}
/* Register the name com.nokia.osso_browser on the D-Bus session bus */
-void dbus_request_osso_browser_name(struct swb_context * ctx) {
- GError * error = NULL;
+void dbus_request_osso_browser_name(struct swb_context *ctx) {
+ GError *error = NULL;
guint result;
if (!ctx || !ctx->dbus_proxy)
return;
if (!dbus_g_proxy_call(ctx->dbus_proxy, "RequestName", &error,
- G_TYPE_STRING, "com.nokia.osso_browser",
- G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_DO_NOT_QUEUE,
- G_TYPE_INVALID,
- G_TYPE_UINT, &result,
- G_TYPE_INVALID)) {
- printf("Couldn't acquire name com.nokia.osso_browser\n");
+ G_TYPE_STRING, "com.nokia.osso_browser",
+ G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ G_TYPE_INVALID,
+ G_TYPE_UINT, &result,
+ G_TYPE_INVALID)) {
+ 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);
}
}
/* Release the name com.nokia.osso_browser on the D-Bus session bus */
-void dbus_release_osso_browser_name(struct swb_context * ctx) {
- GError * error = NULL;
+void dbus_release_osso_browser_name(struct swb_context *ctx) {
+ GError *error = NULL;
guint result;
if (!ctx || !ctx->dbus_proxy)
return;
dbus_g_proxy_call(ctx->dbus_proxy, "ReleaseName", &error,
- G_TYPE_STRING, "com.nokia.osso_browser",
- G_TYPE_INVALID,
- G_TYPE_UINT, &result,
- G_TYPE_INVALID);
+ G_TYPE_STRING, "com.nokia.osso_browser",
+ G_TYPE_INVALID,
+ G_TYPE_UINT, &result,
+ G_TYPE_INVALID);
}