X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=dbus-server-bindings.c;h=9c4d6cde124218ce0c7c4299f1e0093d7d2e0cd7;hp=3875929c72a2adfc75ce5e9c05c04215f480cd20;hb=acd7680b31f4fee62fe05395dc10f57ae1db03d1;hpb=3b21071cc24c86c08dc106c8d599280a3fcf8ed4 diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c index 3875929..9c4d6cd 100644 --- a/dbus-server-bindings.c +++ b/dbus-server-bindings.c @@ -29,6 +29,7 @@ #include "browser-switchboard.h" #include "launcher.h" #include "dbus-server-bindings.h" +#include "log.h" extern struct swb_context ctx; @@ -67,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://" */ @@ -81,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); } } @@ -146,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); } }