[telepathy-gabble/master] Log gabble messages which do not originate from gabble_debug.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/gabble.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gabble.c b/src/gabble.c
index e64c42e..12676ae 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -59,7 +59,8 @@ simple_log (const gchar *log_domain,
 
   /* G_LOG_DOMAIN = "gabble". No need to send gabble messages to the debugger
    * as they already have in gabble_debug. */
-  if (tp_strdiff (log_domain, G_LOG_DOMAIN))
+  if (log_level != G_LOG_LEVEL_DEBUG
+      || tp_strdiff (log_domain, G_LOG_DOMAIN))
     {
       GTimeVal now;
       g_get_current_time (&now);
@@ -86,7 +87,8 @@ stamp_log (const gchar *log_domain,
   g_free (tmp);
 
   /* Gabble messages are already sent to the debugger in gabble_debug. */
-  if (tp_strdiff (log_domain, G_LOG_DOMAIN))
+  if (log_level != G_LOG_LEVEL_DEBUG
+      || tp_strdiff (log_domain, G_LOG_DOMAIN))
     log_to_debugger (&now, log_domain, log_level, message);
 }
 #endif
-- 
1.5.6.5