From e0634a4060b3ff67b6bcd92a02aca62ab453a3ca Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 23 Feb 2023 17:16:52 +0100
Subject: [PATCH] x11: Make some unnecessarily public API private again

There's a few functions that GNOME Shell shouldn't ever need,
stop exporting them as public API.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2779>
---
 src/meta/meta-x11-display.h        | 16 ----------------
 src/x11/meta-x11-display-private.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/meta/meta-x11-display.h b/src/meta/meta-x11-display.h
index 4a823b972..b4a53f933 100644
--- a/src/meta/meta-x11-display.h
+++ b/src/meta/meta-x11-display.h
@@ -36,32 +36,16 @@ typedef void (* MetaX11DisplayEventFunc) (MetaX11Display *x11_display,
 META_EXPORT
 G_DECLARE_FINAL_TYPE (MetaX11Display, meta_x11_display, META, X11_DISPLAY, GObject)
 
-META_EXPORT
-int      meta_x11_display_get_screen_number (MetaX11Display *x11_display);
-
 META_EXPORT
 Display *meta_x11_display_get_xdisplay      (MetaX11Display *x11_display);
 
 META_EXPORT
 Window   meta_x11_display_get_xroot         (MetaX11Display *x11_display);
 
-META_EXPORT
-int      meta_x11_display_get_damage_event_base (MetaX11Display *x11_display);
-
-META_EXPORT
-void meta_x11_display_set_cm_selection (MetaX11Display *x11_display);
-
-META_EXPORT
-gboolean meta_x11_display_xwindow_is_a_no_focus_window (MetaX11Display *x11_display,
-                                                        Window xwindow);
-
 META_EXPORT
 void     meta_x11_display_set_stage_input_region (MetaX11Display *x11_display,
                                                   XserverRegion   region);
 
-META_EXPORT
-void     meta_x11_display_clear_stage_input_region (MetaX11Display *x11_display);
-
 META_EXPORT
 unsigned int meta_x11_display_add_event_func (MetaX11Display          *x11_display,
                                               MetaX11DisplayEventFunc  event_func,
diff --git a/src/x11/meta-x11-display-private.h b/src/x11/meta-x11-display-private.h
index 3763dc969..95ea5a594 100644
--- a/src/x11/meta-x11-display-private.h
+++ b/src/x11/meta-x11-display-private.h
@@ -287,4 +287,15 @@ MetaDisplay * meta_x11_display_get_display (MetaX11Display *x11_display);
 void meta_x11_display_run_event_funcs (MetaX11Display *x11_display,
                                        XEvent         *xevent);
 
+int meta_x11_display_get_screen_number (MetaX11Display *x11_display);
+
+int meta_x11_display_get_damage_event_base (MetaX11Display *x11_display);
+
+void meta_x11_display_set_cm_selection (MetaX11Display *x11_display);
+
+gboolean meta_x11_display_xwindow_is_a_no_focus_window (MetaX11Display *x11_display,
+                                                        Window xwindow);
+
+void meta_x11_display_clear_stage_input_region (MetaX11Display *x11_display);
+
 #endif /* META_X11_DISPLAY_PRIVATE_H */