Replace usage of GLogLevel flags everywhere

ws_log_domains.h needs to be included before wslog.h to be used
to define WS_LOG_DOMAIN. Also the definition for enum ws_log_level
needs to be exported for other APIs so move that to ws_log_domains.h
and rename the file to ws_log_defs.h to reflect the new scope.

1 files changed, 5 insertions, 4 deletions

diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index 3dd61f5907..bfd1c1b3c8 100644
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
@@ -20,6 +20,8 @@
 
 #include "ws_attributes.h"
 
+#include <wsutil/wslog.h>
+
 void register_tap_listener_funnel(void);
 
 struct _funnel_text_window_t {
@@ -64,12 +66,11 @@ static const gchar *text_window_get_text(funnel_text_window_t *tw) {
     return tw->text->str;
 }
 
-/* XXX: finish this */
-static void funnel_logger(const gchar *log_domain _U_,
-                          GLogLevelFlags log_level _U_,
+static void funnel_logger(const gchar *log_domain,
+                          enum ws_log_level log_level,
                           const gchar *message,
                           gpointer user_data _U_) {
-    fputs(message, stderr);
+    ws_log(log_domain, log_level, "%s", message);
 }