X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=launcher.c;h=eb16cf46e0e063605404b35212ca175fd147e3f6;hp=f42e999d5333b23c781c65445511b4b2cf4c2ae2;hb=refs%2Fheads%2Fmaster;hpb=50dddc3250ae5a7116a6e3310a3407344df74f7c diff --git a/launcher.c b/launcher.c index f42e999..eb16cf4 100644 --- a/launcher.c +++ b/launcher.c @@ -288,16 +288,18 @@ pid_t launch_microb_start_browser_process(DBusConnection *conn, int fd) { int launch_microb_open_window(struct swb_context *ctx, char *uri, int flags) { - DBusGProxy *g_proxy; + static DBusGProxy *g_proxy = NULL; GError *gerror = NULL; - g_proxy = dbus_g_proxy_new_for_name(ctx->session_bus, - "com.nokia.osso_browser", - "/com/nokia/osso_browser/request", - "com.nokia.osso_browser"); if (!g_proxy) { - log_msg("Couldn't get a com.nokia.osso_browser proxy\n"); - return 0; + g_proxy = dbus_g_proxy_new_for_name(ctx->session_bus, + "com.nokia.osso_browser", + "/com/nokia/osso_browser/request", + "com.nokia.osso_browser"); + if (!g_proxy) { + log_msg("Couldn't get a com.nokia.osso_browser proxy\n"); + return 0; + } } if (!strcmp(uri, "new_window")) { @@ -321,7 +323,7 @@ int launch_microb_open_window(struct swb_context *ctx, char *uri, uri = "about:blank"; } } - if (!dbus_g_proxy_call(g_proxy, "load_url", + if (!dbus_g_proxy_call(g_proxy, "open_new_window", &gerror, G_TYPE_STRING, uri, G_TYPE_INVALID, @@ -331,7 +333,6 @@ int launch_microb_open_window(struct swb_context *ctx, char *uri, return 0; } - g_object_unref(g_proxy); return 1; }