*/
#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"
+#include <tp-account-widgets/tpaw-debug.h>
#ifdef ENABLE_DEBUG
{ "Chat", EMPATHY_DEBUG_CHAT },
{ "Contact", EMPATHY_DEBUG_CONTACT },
{ "Account", EMPATHY_DEBUG_ACCOUNT },
- { "Irc", EMPATHY_DEBUG_IRC },
{ "Dispatcher", EMPATHY_DEBUG_DISPATCHER },
{ "Ft", EMPATHY_DEBUG_FT },
{ "Location", EMPATHY_DEBUG_LOCATION },
{ "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, }
};
for (nkeys = 0; keys[nkeys].value; nkeys++);
tp_debug_set_flags (flags_string);
+ tpaw_debug_set_flags (flags_string);
if (flags_string)
debug_set_flags (g_parse_debug_string (flags_string, keys, nkeys));
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
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);