[telepathy-glib/master] Ignore errors if tp_dbus_daemon_dup fails.

Jonny Lamb jonny.lamb at collabora.co.uk
Mon Aug 24 08:17:51 PDT 2009


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 telepathy-glib/debug-sender.c |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index fb450a4..e61f2bf 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
-- 
1.5.6.5




More information about the telepathy-commits mailing list