tools: Drop unnecessary conditionals
authorMatthias Clasen <mclasen@redhat.com>
Thu, 20 Jul 2023 17:10:53 +0000 (13:10 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 20 Jul 2023 19:18:13 +0000 (15:18 -0400)
We require GLib 2.76 now.

tools/gtk-builder-tool.c

index 48b23f0e06241b5e77bb9b90499741c7881b0c7e..a47c76c8fb5eeb6e0ce393ffb4b57a81e87514ae 100644 (file)
@@ -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)