Merge branch 'gnome-3-8'

[empathy.git] / libempathy / empathy-debug.c

diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 9d69b801cab4aa167e3137b4f6a6b50e6a1f724c..75900f4ade604882c5d59c4e56b35d971d388411 100644 (file)
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -19,22 +19,8 @@
  */
 
 #include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include <telepathy-glib/debug.h>
-
 #include "empathy-debug.h"
 
-#include "empathy-debugger.h"
-
 #ifdef ENABLE_DEBUG
 
 static EmpathyDebugFlags flags = 0;
@@ -50,6 +36,12 @@ static GDebugKey keys[] = {
   { "Location", EMPATHY_DEBUG_LOCATION },
   { "Other", EMPATHY_DEBUG_OTHER },
   { "Connectivity", EMPATHY_DEBUG_CONNECTIVITY },
+  { "ImportMc4Accounts", EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS },
+  { "Tests", EMPATHY_DEBUG_TESTS },
+  { "Voip", EMPATHY_DEBUG_VOIP },
+  { "Tls", EMPATHY_DEBUG_TLS },
+  { "Sasl", EMPATHY_DEBUG_SASL },
+  { "Camera", EMPATHY_DEBUG_CAMERA },
   { 0, }
 };
 
@@ -107,25 +99,28 @@ empathy_debug_free (void)
   if (flag_to_keys == NULL)
     return;
 
-  g_hash_table_destroy (flag_to_keys);
+  g_hash_table_unref (flag_to_keys);
   flag_to_keys = NULL;
 }
 
 static void
-log_to_debugger (EmpathyDebugFlags flag,
+log_to_debug_sender (EmpathyDebugFlags flag,
     const gchar *message)
 {
-  EmpathyDebugger *dbg = empathy_debugger_get_singleton ();
+  TpDebugSender *sender;
   gchar *domain;
   GTimeVal now;
 
+  sender = tp_debug_sender_dup ();
+
   g_get_current_time (&now);
 
   domain = g_strdup_printf ("%s/%s", G_LOG_DOMAIN, debug_flag_to_key (flag));
 
-  empathy_debugger_add_message (dbg, &now, domain, G_LOG_LEVEL_DEBUG, message);
+  tp_debug_sender_add_message (sender, &now, domain, G_LOG_LEVEL_DEBUG, message);
 
   g_free (domain);
+  g_object_unref (sender);
 }
 
 void
@@ -140,7 +135,7 @@ empathy_debug (EmpathyDebugFlags flag,
   message = g_strdup_vprintf (format, args);
   va_end (args);
 
-  log_to_debugger (flag, message);
+  log_to_debug_sender (flag, message);
 
   if (flag & flags)
     g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s", message);