From 9a75de9309fc912570b166fb31a99ffdcb93099c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 1 Oct 2020 15:03:13 +0200
Subject: [PATCH] util: Remove a bunch of unused debug topics

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1465
---
 src/core/util.c |  8 --------
 src/meta/util.h | 42 +++++++++++++++++-------------------------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/core/util.c b/src/core/util.c
index f6327fca1..f16cf7ed3 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -287,8 +287,6 @@ topic_name (MetaDebugTopic topic)
       return "WORKAREA";
     case META_DEBUG_STACK:
       return "STACK";
-    case META_DEBUG_THEMES:
-      return "THEMES";
     case META_DEBUG_SM:
       return "SM";
     case META_DEBUG_EVENTS:
@@ -303,14 +301,10 @@ topic_name (MetaDebugTopic topic)
       return "GEOMETRY";
     case META_DEBUG_PING:
       return "PING";
-    case META_DEBUG_XINERAMA:
-      return "XINERAMA";
     case META_DEBUG_KEYBINDINGS:
       return "KEYBINDINGS";
     case META_DEBUG_SYNC:
       return "SYNC";
-    case META_DEBUG_ERRORS:
-      return "ERRORS";
     case META_DEBUG_STARTUP:
       return "STARTUP";
     case META_DEBUG_PREFS:
@@ -321,8 +315,6 @@ topic_name (MetaDebugTopic topic)
       return "RESIZING";
     case META_DEBUG_SHAPES:
       return "SHAPES";
-    case META_DEBUG_COMPOSITOR:
-      return "COMPOSITOR";
     case META_DEBUG_EDGE_RESISTANCE:
       return "EDGE_RESISTANCE";
     case META_DEBUG_DBUS:
diff --git a/src/meta/util.h b/src/meta/util.h
index a5d7bb3a3..94b320dae 100644
--- a/src/meta/util.h
+++ b/src/meta/util.h
@@ -67,7 +67,6 @@ void meta_fatal      (const char *format,
  * @META_DEBUG_FOCUS: focus
  * @META_DEBUG_WORKAREA: workarea
  * @META_DEBUG_STACK: stack
- * @META_DEBUG_THEMES: themes
  * @META_DEBUG_SM: session management
  * @META_DEBUG_EVENTS: events
  * @META_DEBUG_WINDOW_STATE: window state
@@ -75,16 +74,13 @@ void meta_fatal      (const char *format,
  * @META_DEBUG_GEOMETRY: geometry
  * @META_DEBUG_PLACEMENT: window placement
  * @META_DEBUG_PING: ping
- * @META_DEBUG_XINERAMA: Xinerama
  * @META_DEBUG_KEYBINDINGS: keybindings
  * @META_DEBUG_SYNC: sync
- * @META_DEBUG_ERRORS: errors
  * @META_DEBUG_STARTUP: startup
  * @META_DEBUG_PREFS: preferences
  * @META_DEBUG_GROUPS: groups
  * @META_DEBUG_RESIZING: resizing
  * @META_DEBUG_SHAPES: shapes
- * @META_DEBUG_COMPOSITOR: compositor
  * @META_DEBUG_EDGE_RESISTANCE: edge resistance
  */
 typedef enum
@@ -93,27 +89,23 @@ typedef enum
   META_DEBUG_FOCUS           = 1 << 0,
   META_DEBUG_WORKAREA        = 1 << 1,
   META_DEBUG_STACK           = 1 << 2,
-  META_DEBUG_THEMES          = 1 << 3,
-  META_DEBUG_SM              = 1 << 4,
-  META_DEBUG_EVENTS          = 1 << 5,
-  META_DEBUG_WINDOW_STATE    = 1 << 6,
-  META_DEBUG_WINDOW_OPS      = 1 << 7,
-  META_DEBUG_GEOMETRY        = 1 << 8,
-  META_DEBUG_PLACEMENT       = 1 << 9,
-  META_DEBUG_PING            = 1 << 10,
-  META_DEBUG_XINERAMA        = 1 << 11,
-  META_DEBUG_KEYBINDINGS     = 1 << 12,
-  META_DEBUG_SYNC            = 1 << 13,
-  META_DEBUG_ERRORS          = 1 << 14,
-  META_DEBUG_STARTUP         = 1 << 15,
-  META_DEBUG_PREFS           = 1 << 16,
-  META_DEBUG_GROUPS          = 1 << 17,
-  META_DEBUG_RESIZING        = 1 << 18,
-  META_DEBUG_SHAPES          = 1 << 19,
-  META_DEBUG_COMPOSITOR      = 1 << 20,
-  META_DEBUG_EDGE_RESISTANCE = 1 << 21,
-  META_DEBUG_DBUS            = 1 << 22,
-  META_DEBUG_INPUT           = 1 << 23
+  META_DEBUG_SM              = 1 << 3,
+  META_DEBUG_EVENTS          = 1 << 4,
+  META_DEBUG_WINDOW_STATE    = 1 << 5,
+  META_DEBUG_WINDOW_OPS      = 1 << 6,
+  META_DEBUG_GEOMETRY        = 1 << 7,
+  META_DEBUG_PLACEMENT       = 1 << 8,
+  META_DEBUG_PING            = 1 << 9,
+  META_DEBUG_KEYBINDINGS     = 1 << 10,
+  META_DEBUG_SYNC            = 1 << 11,
+  META_DEBUG_STARTUP         = 1 << 12,
+  META_DEBUG_PREFS           = 1 << 13,
+  META_DEBUG_GROUPS          = 1 << 14,
+  META_DEBUG_RESIZING        = 1 << 15,
+  META_DEBUG_SHAPES          = 1 << 16,
+  META_DEBUG_EDGE_RESISTANCE = 1 << 17,
+  META_DEBUG_DBUS            = 1 << 18,
+  META_DEBUG_INPUT           = 1 << 19,
 } MetaDebugTopic;
 
 /**