X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=dbus-server-bindings.c;h=f20a6901fa79f525196f42d3e94b90233545f9ba;hp=8224defbdc2d3ad447b7da945cc8eeabe1312560;hb=7f69bb7fd641dfb4049c4f85d606518fca482dc9;hpb=ef66c102d916ea842c8ba15f010bf04326e3a590 diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c index 8224def..f20a690 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://" */ @@ -126,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) @@ -155,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); } }