Make startup notification work for MicroB menu entry

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

diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c
index 8224def..e3d2c4f 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 "browser-switchboard.h"
 #include "launcher.h"
 #include "dbus-server-bindings.h"

+#include "log.h"

 
 extern struct swb_context ctx;
 
 
 extern struct swb_context ctx;
 

@@ -67,7 +68,7 @@ static void open_address(const char *uri) {
                /* Not much to do in this case ... */
                return;
 
                /* 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://" */
        if (uri[0] == '/') {
                /* URI begins with a '/' -- assume it points to a local file
                   and prefix with "file://" */

@@ -126,13 +127,23 @@ gboolean osso_browser_top_application(OssoBrowser *obj,
                GError **error) {
        if (!ctx.continuous_mode)
                ignore_reconfig_requests();
                GError **error) {
        if (!ctx.continuous_mode)
                ignore_reconfig_requests();

+       launch_browser(&ctx, "new_window");
+       return TRUE;
+}
+
+
+/*
+ * The org.maemo.garage.browser_switchboard D-Bus interface
+ */
+gboolean switchboard_top_application(OssoBrowser *obj,
+               GError **error) {
+       if (!ctx.continuous_mode)
+               ignore_reconfig_requests();

        launch_microb(&ctx, "new_window");
        return TRUE;
 }
 
        launch_microb(&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 */
-gboolean osso_browser_switchboard_launch_microb(OssoBrowser *obj,
+gboolean switchboard_launch_microb(OssoBrowser *obj,

                const char *uri, GError **error) {
        if (!ctx.continuous_mode)
                ignore_reconfig_requests();
                const char *uri, GError **error) {
        if (!ctx.continuous_mode)
                ignore_reconfig_requests();

@@ -155,11 +166,11 @@ void dbus_request_osso_browser_name(struct swb_context *ctx) {
                               G_TYPE_INVALID,
                               G_TYPE_UINT, &result,
                               G_TYPE_INVALID)) {
                               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) {  
                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);
        }
 }
                exit(1);
        }
 }