Remove commented out code.

[geeqie.git] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index dc4b1db..a7f2417 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *
@@ -10,28 +10,50 @@
  */
 
 #include "main.h"
+#include "debug.h"
 
+#include "logwindow.h"
+#include "ui_fileops.h"
+
+#include <glib/gprintf.h>
 
 /*
  * Logging functions
  */
 
-gint log_domain_printf(const char *domain, const gchar *format, ...)
+static gboolean log_msg_cb(gpointer data)
+{
+       gchar *buf = data;
+       log_window_append(buf, LOG_MSG);
+       g_free(buf);
+       return FALSE;
+}
+
+static gboolean log_normal_cb(gpointer data)
+{
+       gchar *buf = data;
+       log_window_append(buf, LOG_NORMAL);
+       g_free(buf);
+       return FALSE;
+}
+
+void log_domain_printf(const gchar *domain, const gchar *format, ...)
 {
        va_list ap;
-       gchar buf[4096];
-       gint ret;
+       gchar *buf;
 
        va_start(ap, format);
-       ret = vsnprintf(buf, sizeof(buf), format, ap);
+       buf = g_strdup_vprintf(format, ap);
        va_end(ap);
 
-       puts(buf);
+       print_term(buf);
+       if (strcmp(domain, DOMAIN_INFO) == 0)
+               g_idle_add(log_normal_cb, buf);
+       else
+               g_idle_add(log_msg_cb, buf);
 
-       return ret;
 }
 
-
 /*
  * Debugging only functions
  */
@@ -48,7 +70,7 @@ gint get_debug_level(void)
 
 void set_debug_level(gint new_level)
 {
-       debug_level = CLAMP(new_level, DEBUG_LEVEL_MIN, DEBUG_LEVEL_MAX);       
+       debug_level = CLAMP(new_level, DEBUG_LEVEL_MIN, DEBUG_LEVEL_MAX);
 }
 
 void debug_level_add(gint delta)
@@ -111,7 +133,7 @@ const gchar *get_exec_time(void)
        previous = tv;
        started = 1;
 
-       g_snprintf(timestr, sizeof(timestr), "%5d.%06d (+%05d.%06d)", (int)tv.tv_sec, (int)tv.tv_usec, (int)delta.tv_sec, (int)delta.tv_usec);
+       g_snprintf(timestr, sizeof(timestr), "%5d.%06d (+%05d.%06d)", (gint)tv.tv_sec, (gint)tv.tv_usec, (gint)delta.tv_sec, (gint)delta.tv_usec);
 
        return timestr;
 }
@@ -122,3 +144,4 @@ void init_exec_time(void)
 }
 
 #endif /* DEBUG */
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */