summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-24 16:17:51 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-24 16:17:51 +0100
commit4e7564a17327a38697240aeb87e602447d70feed (patch)
tree512a77232b29ebb02739b227e3b9a2ba16cdf177
parent9f534dd448079c3ebbc5280dd46dbf6203bff5e1 (diff)
Ignore errors if tp_dbus_daemon_dup fails.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--telepathy-glib/debug-sender.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index fb450a43..e61f2bf3 100644
--- a/telepathy-glib/debug-sender.c
+++ b/telepathy-glib/debug-sender.c
@@ -219,22 +219,18 @@ static void
tp_debug_sender_constructed (GObject *object)
{
TpDBusDaemon *dbus_daemon;
- GError *error = NULL;
debug_sender = g_object_new (TP_TYPE_DEBUG_SENDER, NULL);
- dbus_daemon = tp_dbus_daemon_dup (&error);
+ dbus_daemon = tp_dbus_daemon_dup (NULL);
- if (error != NULL)
+ if (dbus_daemon != NULL)
{
- g_error_free (error);
- return;
- }
-
- dbus_g_connection_register_g_object (
- tp_proxy_get_dbus_connection (dbus_daemon),
- "/org/freedesktop/Telepathy/debug", (GObject *) debug_sender);
+ dbus_g_connection_register_g_object (
+ tp_proxy_get_dbus_connection (dbus_daemon),
+ "/org/freedesktop/Telepathy/debug", (GObject *) debug_sender);
- g_object_unref (dbus_daemon);
+ g_object_unref (dbus_daemon);
+ }
}
static void