[folks] Handle both the dbus-glib and GDBus missing logger errors.



commit 67b5617bcbb2109dd43d9f25feae52c7efaeaa1f
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Wed Jun 22 13:41:15 2011 -0700

    Handle both the dbus-glib and GDBus missing logger errors.
    
    Helps: bgo#629716 - Migrate Folks to GDBus

 tests/lib/telepathy/contactlist/backend.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/tests/lib/telepathy/contactlist/backend.c b/tests/lib/telepathy/contactlist/backend.c
index 8d12c05..9c7a2e0 100644
--- a/tests/lib/telepathy/contactlist/backend.c
+++ b/tests/lib/telepathy/contactlist/backend.c
@@ -136,9 +136,18 @@ _log_should_suppress (const char *domain,
    GLogLevelFlags flags,
    const char *message)
 {
-  /* Ignore the error caused by not running the logger */
-  return g_str_has_suffix (message,
+  gboolean suppress = FALSE;
+
+  /* Ignore the error caused by not running the logger through dbus-glib */
+  suppress |= g_str_has_suffix (message,
+      "The name org.freedesktop.Telepathy.Logger was not provided by any "
+      ".service files");
+
+  /* And again for GDBus */
+  suppress |= g_str_has_suffix (message,
       "Lost connection to the telepathy-logger service.");
+
+  return suppress;
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]