From cfc09eb5b54fa10485d52db90924cc37a0a7d757 Mon Sep 17 00:00:00 2001
From: Vivek Dasmohapatra <vivek@collabora.co.uk>
Date: Thu, 21 Apr 2011 12:56:27 +0100
Subject: Simplify filter-add error checking

---
 src/client-registry.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/client-registry.c b/src/client-registry.c
index 796f7ea0..6651b76e 100644
--- a/src/client-registry.c
+++ b/src/client-registry.c
@@ -383,16 +383,8 @@ watch_clients (McdClientRegistry *self)
       self,
       NULL);
 
-  if (arg0_filtered)
-    {
-      arg0_filtered = add_match (dconn, CLIENT_MATCH_RULE, "client names");
-
-      if (!arg0_filtered)
-        arg0_filtered = add_match (dconn, NAME_OWNER_RULE, "all dbus names");
-    }
-
-  if (!arg0_filtered)
-    g_warning ("Could not add match & filter for telepathy client names");
+  if (arg0_filtered && !add_match (dconn, CLIENT_MATCH_RULE, "client names"))
+    add_match (dconn, NAME_OWNER_RULE, "all dbus names");
 }
 
 static void
-- 
cgit v1.2.1