Move log handler to `comet.c`

3 files changed, 17 insertions, 29 deletions

diff --git a/src/comet.c b/src/comet.c
index cf325bf..df5ffe4 100644
--- a/src/comet.c
+++ b/src/comet.c
@@ -23,9 +23,25 @@ static gboolean mainloop_draw(gpointer data)
     return G_SOURCE_REMOVE;
 }
 
+static void log_handler(const char *log_domain,
+                        GLogLevelFlags level,
+                        const char *message,
+                        gpointer log_level)
+{
+    GLogLevelFlags message_level = level & G_LOG_LEVEL_MASK;
+
+    if ((GLogLevelFlags)log_level < message_level)
+        return;
+
+    if (message_level <= G_LOG_LEVEL_WARNING)
+        g_printerr("%s\n", message);
+    else
+        g_print("%s\n", message);
+}
+
 int main(int argc, char **argv)
 {
-    log_init(G_LOG_LEVEL_DEBUG);
+    g_log_set_default_handler(log_handler, (gpointer)G_LOG_LEVEL_DEBUG);
 
     GMainLoop *mainloop = g_main_loop_new(NULL, FALSE);
 
diff --git a/src/log.c b/src/log.c
deleted file mode 100644
index f4c529f..0000000
--- a/src/log.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <glib.h>
-
-#include "log.h"
-
-static void log_handler(const char *log_domain,
-                        GLogLevelFlags level,
-                        const char *message,
-                        gpointer log_level)
-{
-	GLogLevelFlags message_level = level & G_LOG_LEVEL_MASK;
-
-	if ((GLogLevelFlags)log_level < message_level)
-		return;
-
-	if (message_level <= G_LOG_LEVEL_WARNING)
-		g_printerr("%s\n", message);
-	else
-		g_print("%s\n", message);
-}
-
-void log_init(GLogLevelFlags level)
-{
-	g_log_set_default_handler(log_handler, (void *)level);
-}
-
-// vim: ts=4 sw=4 et
diff --git a/src/log.h b/src/log.h
index c96536b..8ee600f 100644
--- a/src/log.h
+++ b/src/log.h
@@ -20,8 +20,6 @@
 #define log_warning(...) g_warning(WARNING_FORMAT(__VA_ARGS__))
 #define log_error(...)   g_error(ERROR_FORMAT(__VA_ARGS__))
 
-void log_init(GLogLevelFlags level);
-
 #endif
 
 // vim: ts=4 sw=4 et