From 3c8e671463630b94f8238ea8caaf6a03b2165278 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 2 Mar 2010 11:17:54 +0000 Subject: [PATCH] Remove code that will always fail and has no use libunique will already register a unique name and we have no other dbus services so we don't need to register a unique name ourselves. Also trying to register one which is the same as what we suggest to libunique will always fail and is thus pointless --- src/empathy-accounts.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index f924acc7..b97bc453 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -259,26 +259,6 @@ main (int argc, char *argv[]) return EXIT_SUCCESS; } - /* Take well-known name */ - dbus_daemon = tp_dbus_daemon_dup (&error); - if (error == NULL) - { - if (!tp_dbus_daemon_request_name (dbus_daemon, - EMPATHY_ACCOUNTS_DBUS_NAME, TRUE, &error)) - { - DEBUG ("Failed to request well-known name: %s", - error ? error->message : "no message"); - g_clear_error (&error); - } - g_object_unref (dbus_daemon); - } - else - { - DEBUG ("Failed to dup dbus daemon: %s", - error ? error->message : "no message"); - g_clear_error (&error); - } - account_manager = tp_account_manager_dup (); tp_account_manager_prepare_async (account_manager, NULL, -- 2.39.2