[libpeas] Cleanup handling G_DEBUG in testing-utils

[Garrett Regier <gregier src gnome org>]

commit db4aec161947ef6611cea73c1908e3168d6f052d
Author: Garrett Regier <garrettregier gmail com>
Date:   Fri Nov 20 03:13:12 2015 -0800

    Cleanup handling G_DEBUG in testing-utils

 tests/testing-util/testing-util.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/tests/testing-util/testing-util.c b/tests/testing-util/testing-util.c
index addc9a0..8c6c28d 100644
--- a/tests/testing-util/testing-util.c
+++ b/tests/testing-util/testing-util.c
@@ -190,8 +190,8 @@ testing_util_init (void)
 {
   GError *error = NULL;
   const GDebugKey glib_debug_keys[] = {
-    { "fatal-warnings",  G_LOG_LEVEL_WARNING  },
-    { "fatal-criticals", G_LOG_LEVEL_CRITICAL }
+    { "fatal-criticals", G_LOG_LEVEL_CRITICAL },
+    { "fatal-warnings",  G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING }
   };
 
   if (initialized)
@@ -209,10 +209,6 @@ testing_util_init (void)
   fatal_flags = g_parse_debug_string (g_getenv ("G_DEBUG"), glib_debug_keys,
                                       G_N_ELEMENTS (glib_debug_keys));
 
-  /* The "fatal-warnings" key implies "fatal-criticals" */
-  if ((fatal_flags & G_LOG_LEVEL_WARNING) != 0)
-    fatal_flags |= G_LOG_LEVEL_CRITICAL;
-
   g_irepository_require_private (g_irepository_get_default (),
                                  BUILDDIR "/libpeas",
                                  "Peas", "1.0", 0, &error);