Harmonize would_drop() replacement for g_log_writer_default_would_drop()

Reuse a better to read would_drop() from ./testsuite/reftests/gtk-reftest.c
in ./tools/gtk-builder-tool.c

Fixed wrong indentation in ./testsuite/reftests/gtk-reftest.c

diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
index a057a2e9d08fc6f035fe27d2b1c8a2b043cbdefc..39b335e17e5127c50b81ccafbd6f7950a948e729 100644 (file)
--- a/testsuite/reftests/gtk-reftest.c
+++ b/testsuite/reftests/gtk-reftest.c
@@ -513,7 +513,7 @@ log_writer (GLogLevelFlags   log_level,
     }
 #endif
 
- if (!would_drop (log_level, NULL))
+  if (!would_drop (log_level, NULL))
     return g_log_writer_standard_streams (log_level, fields, n_fields, user_data);
 
   return G_LOG_WRITER_HANDLED;

diff --git a/tools/gtk-builder-tool.c b/tools/gtk-builder-tool.c
index 278d3fb4db0ef3b1b503c8e2b2be046047d20534..15ee62dd20bc44adaccc02881c7d5ac704734b8a 100644 (file)
--- a/tools/gtk-builder-tool.c
+++ b/tools/gtk-builder-tool.c
@@ -55,9 +55,13 @@ static gboolean
 would_drop (GLogLevelFlags  level,
             const char     *domain)
 {
+#if GLIB_CHECK_VERSION (2, 68, 0)
+  return g_log_writer_default_would_drop (level, domain);
+#else
   return (level & (G_LOG_LEVEL_ERROR |
                    G_LOG_LEVEL_CRITICAL |
                    G_LOG_LEVEL_WARNING)) == 0;
+#endif
 }
 
 static GLogWriterOutput