From 63a8539683af95bdddadc6d9ec12f34ff94efc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 30 Dec 2024 15:41:01 +0100
Subject: [PATCH] display: Replace 'ping' debug topic with new 'display' topic

"Ping" isn't important enough for having its own debug topic, so rename
it a bit to cover more areas.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4005>
---
 src/core/display.c    | 10 +++++-----
 src/core/util.c       |  6 +++---
 src/meta/meta-debug.h |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/display.c b/src/core/display.c
index 58dfbc388..e94688582 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1831,7 +1831,7 @@ meta_display_ping_timeout (gpointer data)
 
   ping_data->ping_timeout_id = 0;
 
-  meta_topic (META_DEBUG_PING,
+  meta_topic (META_DEBUG_DISPLAY,
               "Ping %u on window %s timed out",
               ping_data->serial, ping_data->window->desc);
 
@@ -1886,7 +1886,7 @@ meta_display_ping_window (MetaWindow *window,
 
       if (window == pending_ping_data->window)
         {
-          meta_topic (META_DEBUG_PING,
+          meta_topic (META_DEBUG_DISPLAY,
                       "Window %s already is being pinged with serial %u",
                       window->desc, pending_ping_data->serial);
           return;
@@ -1912,7 +1912,7 @@ meta_display_ping_window (MetaWindow *window,
 
   display->pending_pings = g_slist_prepend (display->pending_pings, ping_data);
 
-  meta_topic (META_DEBUG_PING,
+  meta_topic (META_DEBUG_DISPLAY,
               "Sending ping with serial %u to window %s",
               serial, window->desc);
 
@@ -1936,7 +1936,7 @@ meta_display_pong_for_serial (MetaDisplay    *display,
 {
   GSList *tmp;
 
-  meta_topic (META_DEBUG_PING, "Received a pong with serial %u", serial);
+  meta_topic (META_DEBUG_DISPLAY, "Received a pong with serial %u", serial);
 
   for (tmp = display->pending_pings; tmp; tmp = tmp->next)
     {
@@ -1944,7 +1944,7 @@ meta_display_pong_for_serial (MetaDisplay    *display,
 
       if (serial == ping_data->serial)
         {
-          meta_topic (META_DEBUG_PING,
+          meta_topic (META_DEBUG_DISPLAY,
                       "Matching ping found for pong %u",
                       ping_data->serial);
 
diff --git a/src/core/util.c b/src/core/util.c
index 93efb30e5..c1a168edb 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -49,7 +49,7 @@ static const GDebugKey meta_debug_keys[] = {
   { "window-ops", META_DEBUG_WINDOW_OPS },
   { "geometry", META_DEBUG_GEOMETRY },
   { "placement", META_DEBUG_PLACEMENT },
-  { "ping", META_DEBUG_PING },
+  { "display", META_DEBUG_DISPLAY },
   { "keybindings", META_DEBUG_KEYBINDINGS },
   { "sync", META_DEBUG_SYNC },
   { "startup", META_DEBUG_STARTUP },
@@ -282,10 +282,10 @@ meta_topic_to_string (MetaDebugTopic topic)
       return "WINDOW_OPS";
     case META_DEBUG_PLACEMENT:
       return "PLACEMENT";
+    case META_DEBUG_DISPLAY:
+      return "DISPLAY";
     case META_DEBUG_GEOMETRY:
       return "GEOMETRY";
-    case META_DEBUG_PING:
-      return "PING";
     case META_DEBUG_KEYBINDINGS:
       return "KEYBINDINGS";
     case META_DEBUG_SYNC:
diff --git a/src/meta/meta-debug.h b/src/meta/meta-debug.h
index 2af3514a5..f5b2ca6be 100644
--- a/src/meta/meta-debug.h
+++ b/src/meta/meta-debug.h
@@ -32,7 +32,7 @@
  * @META_DEBUG_WINDOW_OPS: window operations
  * @META_DEBUG_GEOMETRY: geometry
  * @META_DEBUG_PLACEMENT: window placement
- * @META_DEBUG_PING: ping
+ * @META_DEBUG_DISPLAY: display
  * @META_DEBUG_KEYBINDINGS: keybindings
  * @META_DEBUG_SYNC: sync
  * @META_DEBUG_STARTUP: startup
@@ -63,7 +63,7 @@ typedef enum
   META_DEBUG_WINDOW_OPS      = 1 << 6,
   META_DEBUG_GEOMETRY        = 1 << 7,
   META_DEBUG_PLACEMENT       = 1 << 8,
-  META_DEBUG_PING            = 1 << 9,
+  META_DEBUG_DISPLAY         = 1 << 9,
   META_DEBUG_KEYBINDINGS     = 1 << 10,
   META_DEBUG_SYNC            = 1 << 11,
   META_DEBUG_STARTUP         = 1 << 12,