From d12e58430d4d4333585fbde77c6591a084ad8820 Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Mon, 22 Feb 2010 02:42:30 -0800 Subject: [PATCH] Revert "Ensure that only one browser-switchboard is active at any time" This reverts commit ae25c6b332df1c92b1433474bbf4c8b8b857b7ff. --- main.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/main.c b/main.c index 2dfe439..5296631 100644 --- a/main.c +++ b/main.c @@ -103,7 +103,6 @@ int main() { OssoBrowser *obj_osso_browser, *obj_osso_browser_req; GMainLoop *mainloop; GError *error = NULL; - int reqname_result; read_config(0); @@ -147,27 +146,6 @@ int main() { return 1; } - /* Get the org.maemo.garage.browser-switchboard name from D-Bus, as - a form of locking to ensure that not more than one - browser-switchboard process is active at any time. With - DBUS_NAME_FLAG_DO_NOT_QUEUE set and DBUS_NAME_FLAG_REPLACE_EXISTING - not set, getting the name succeeds if and only if no other - process owns the name. */ - if (!dbus_g_proxy_call(ctx.dbus_proxy, "RequestName", &error, - G_TYPE_STRING, "org.maemo.garage.browser-switchboard", - G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE, - G_TYPE_INVALID, - G_TYPE_UINT, &reqname_result, - G_TYPE_INVALID)) { - printf("Couldn't acquire browser-switchboard lock: %s\n", - error->message); - return 1; - } - if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - printf("Another browser-switchboard already running\n"); - return 1; - } - dbus_request_osso_browser_name(&ctx); /* Register ourselves to handle the osso_browser D-Bus methods */ -- 1.7.9.5