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 000bed9..1660110 100644 (file)
--- a/dbus-server-bindings.c
+++ b/dbus-server-bindings.c
@@ -107,6 +107,15 @@ gboolean osso_browser_load_url(OssoBrowser *obj,
        return TRUE;
 }
 
+gboolean osso_browser_load_url_sb(OssoBrowser *obj,
+               const char *uri, gboolean fullscreen, GError **error) {
+       /* XXX don't ignore fullscreen requests */
+       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)
@@ -123,6 +132,15 @@ gboolean osso_browser_open_new_window(OssoBrowser *obj,
        return TRUE;
 }
 
+gboolean osso_browser_open_new_window_sb(OssoBrowser *obj,
+               const char *uri, gboolean fullscreen, GError **error) {
+       /* XXX don't ignore fullscreen requests */
+       if (!ctx.continuous_mode)
+               ignore_reconfig_requests();
+       open_address(uri);
+       return TRUE;
+}
+
 gboolean osso_browser_top_application(OssoBrowser *obj,
                GError **error) {
        if (!ctx.continuous_mode)
@@ -150,6 +168,7 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
        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,
@@ -159,11 +178,14 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
                log_msg("Couldn't acquire name com.nokia.osso_browser\n");
                exit(1);
        }
-       if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {  
+       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,
@@ -171,11 +193,10 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
                               G_TYPE_UINT, &result,
                               G_TYPE_INVALID)) {
                log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
-               exit(1);
+               g_error_free(error);
        }
-       if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {  
+       if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
                log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
-               exit(1);
        }
 }