summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2011-06-22 13:41:15 -0700
committerTravis Reitter <travis.reitter@collabora.co.uk>2011-06-23 09:34:20 -0700
commit67b5617bcbb2109dd43d9f25feae52c7efaeaa1f (patch)
tree308e9d7246715e85e8e3e21d81335ee4ea3e4899
parentbe621be89c3e25c5875e245560328b3b556675ad (diff)
Handle both the dbus-glib and GDBus missing logger errors.
Helps: bgo#629716 - Migrate Folks to GDBus
-rw-r--r--tests/lib/telepathy/contactlist/backend.c13
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