aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-03-02 19:17:54 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-03-02 19:20:59 +0800
commit3c8e671463630b94f8238ea8caaf6a03b2165278 (patch)
tree8fc787591f7e63ccb1760ecc1843902e68ef134b
parent9a9ce40c7f0a6e5fc19e035dba5c1812a9d4434a (diff)
downloadgsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.tar
gsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.tar.gz
gsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.tar.bz2
gsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.tar.lz
gsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.tar.xz
gsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.tar.zst
gsoc2013-empathy-3c8e671463630b94f8238ea8caaf6a03b2165278.zip
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
-rw-r--r--src/empathy-accounts.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index f924acc73..b97bc4533 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,