Center the 'smiley images' inside the menu items

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

diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 16d61c37c4f8dcf8912ad8b09fe4c2477fe51e8c..d919743eb76ad022664708c7db6b8bb2f39bce95 100644 (file)
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /*
  * Copyright (C) 2007 Collabora Ltd.
  * Copyright (C) 2007 Nokia Corporation
@@ -19,20 +19,10 @@
  */
 
 #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 <tp-account-widgets/tpaw-debug.h>
+
 #ifdef ENABLE_DEBUG
 
 static EmpathyDebugFlags flags = 0;
@@ -42,9 +32,17 @@ static GDebugKey keys[] = {
   { "Chat", EMPATHY_DEBUG_CHAT },
   { "Contact", EMPATHY_DEBUG_CONTACT },
   { "Account", EMPATHY_DEBUG_ACCOUNT },
-  { "Irc", EMPATHY_DEBUG_IRC },
-  { "Filter", EMPATHY_DEBUG_FILTER },
+  { "Dispatcher", EMPATHY_DEBUG_DISPATCHER },
+  { "Ft", EMPATHY_DEBUG_FT },
+  { "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, }
 };
 
@@ -62,6 +60,7 @@ empathy_debug_set_flags (const gchar *flags_string)
   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));
@@ -73,18 +72,77 @@ empathy_debug_flag_is_set (EmpathyDebugFlags flag)
   return (flag & flags) != 0;
 }
 
+GHashTable *flag_to_keys = NULL;
+
+static const gchar *
+debug_flag_to_key (EmpathyDebugFlags flag)
+{
+  if (flag_to_keys == NULL)
+    {
+      guint i;
+
+      flag_to_keys = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+          NULL, g_free);
+
+      for (i = 0; keys[i].value; i++)
+        {
+          GDebugKey key = (GDebugKey) keys[i];
+          g_hash_table_insert (flag_to_keys, GUINT_TO_POINTER (key.value),
+              g_strdup (key.key));
+        }
+    }
+
+  return g_hash_table_lookup (flag_to_keys, GUINT_TO_POINTER (flag));
+}
+
+void
+empathy_debug_free (void)
+{
+  if (flag_to_keys == NULL)
+    return;
+
+  g_hash_table_unref (flag_to_keys);
+  flag_to_keys = NULL;
+}
+
+static void
+log_to_debug_sender (EmpathyDebugFlags flag,
+    const gchar *message)
+{
+  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));
+
+  tp_debug_sender_add_message (sender, &now, domain, G_LOG_LEVEL_DEBUG, message);
+
+  g_free (domain);
+  g_object_unref (sender);
+}
+
 void
 empathy_debug (EmpathyDebugFlags flag,
-               const gchar *format,
-               ...)
+    const gchar *format,
+    ...)
 {
+  gchar *message;
+  va_list args;
+
+  va_start (args, format);
+  message = g_strdup_vprintf (format, args);
+  va_end (args);
+
+  log_to_debug_sender (flag, message);
+
   if (flag & flags)
-    {
-      va_list args;
-      va_start (args, format);
-      g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
-      va_end (args);
-    }
+    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s", message);
+
+  g_free (message);
 }
 
 #else