From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 20 Jul 2023 17:10:53 +0000 (-0400)
Subject: tools: Drop unnecessary conditionals
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~54^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e523d3a50ee9aa02a05517679c2e31cdd9faa4dd;p=gtk4.git

tools: Drop unnecessary conditionals

We require GLib 2.76 now.
---

diff --git a/tools/gtk-builder-tool.c b/tools/gtk-builder-tool.c
index 48b23f0e06..a47c76c8fb 100644
--- a/tools/gtk-builder-tool.c
+++ b/tools/gtk-builder-tool.c
@@ -49,22 +49,6 @@ usage (void)
   exit (1);
 }
 
-/* A simplified version of g_log_writer_default_would_drop(), to avoid
- * bumping up the required version of GLib to 2.68
- */
-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
 log_writer_func (GLogLevelFlags   level,
                  const GLogField *fields,
@@ -83,7 +67,7 @@ log_writer_func (GLogLevelFlags   level,
         message = fields[i].value;
     }
 
-  if (message != NULL && !would_drop (level, domain))
+  if (message != NULL && !g_log_writer_default_would_drop (level, domain))
     {
       const char *prefix;
       switch (level & G_LOG_LEVEL_MASK)