[gnome-shell] Don't send all debug messages to Telepathy
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Don't send all debug messages to Telepathy
- Date: Thu, 13 Feb 2014 12:04:50 +0000 (UTC)
commit f6240e114c8c6bf3be2d3450deaabc68f165f4c5
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Thu Feb 13 01:04:58 2014 +0100
Don't send all debug messages to Telepathy
The log handler can be invoked at bad times, and in particular
it can be invoked from gsignal with the signal lock taken.
At that time, calling into arbitrary high-level APIs can
cause a dead-lock.
Instead, only send to telepathy the tp-glib debug messages.
Everything else is in the journal anyway.
https://bugzilla.gnome.org/show_bug.cgi?id=724256
src/main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index 99494a0..55f6683 100644
--- a/src/main.c
+++ b/src/main.c
@@ -271,7 +271,9 @@ default_log_handler (const char *log_domain,
g_get_current_time (&now);
- tp_debug_sender_add_message (sender, &now, log_domain, log_level, message);
+ /* Send telepathy debug through DBus */
+ if (log_domain != NULL && g_str_has_prefix (log_domain, "tp-glib"))
+ tp_debug_sender_add_message (sender, &now, log_domain, log_level, message);
/* Filter out telepathy-glib logs, we don't want to flood Shell's output
* with those. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]