Update debian/changelog, bump version number

[browser-switch] / dbus-server-bindings.c

diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c
index 3875929..748f557 100644 (file)
--- 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);
        }
 }
@@ -117,12 +127,12 @@ gboolean osso_browser_top_application(OssoBrowser *obj,
                GError **error) {
        if (!ctx.continuous_mode)
                ignore_reconfig_requests();
-       launch_microb(&ctx, "new_window");
+       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)
@@ -137,22 +147,39 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
        GError *error = NULL;
        guint result;
 
-       if (!ctx || !ctx->dbus_proxy)
+       if (!ctx || !ctx->dbus_proxy || !ctx->dbus_system_proxy)
                return;
 
+       /* Acquire the com.nokia.osso_browser name on the session bus */
        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");
+               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");
+       if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+               log_msg("Couldn't acquire name com.nokia.osso_browser\n");
                exit(1);
        }
+
+       /* Try to acquire the com.nokia.osso_browser name on the system bus
+          Treat a failure as non-fatal, which makes testing on desktop systems
+          easier */
+       if (!dbus_g_proxy_call(ctx->dbus_system_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)) {
+               log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
+               g_error_free(error);
+       }
+       if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+               log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
+       }
 }
 
 /* Release the name com.nokia.osso_browser on the D-Bus session bus */
@@ -160,7 +187,7 @@ void dbus_release_osso_browser_name(struct swb_context *ctx) {
        GError *error = NULL;
        guint result;
 
-       if (!ctx || !ctx->dbus_proxy)
+       if (!ctx || !ctx->dbus_proxy || !ctx->dbus_system_proxy)
                return;
 
        dbus_g_proxy_call(ctx->dbus_proxy, "ReleaseName", &error,
@@ -168,4 +195,9 @@ void dbus_release_osso_browser_name(struct swb_context *ctx) {
                          G_TYPE_INVALID,
                          G_TYPE_UINT, &result,
                          G_TYPE_INVALID);
+       dbus_g_proxy_call(ctx->dbus_system_proxy, "ReleaseName", &error,
+                         G_TYPE_STRING, "com.nokia.osso_browser",
+                         G_TYPE_INVALID,
+                         G_TYPE_UINT, &result,
+                         G_TYPE_INVALID);
 }