From 4f606261d3682b629a24a85ba4255931b6319115 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Tue, 20 Aug 2024 17:04:55 +0200
Subject: [PATCH] clutter: Remove unused get_font_map

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3962>
---
 clutter/clutter/clutter-actor.c | 13 +++++++------
 clutter/clutter/clutter-main.c  | 16 ----------------
 clutter/clutter/clutter-main.h  |  3 ---
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 237c3aeed..f5b81e2cd 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -13126,15 +13126,16 @@ PangoContext *
 clutter_actor_create_pango_context (ClutterActor *self)
 {
   CoglPangoFontMap *font_map;
-  PangoContext *context;
+  ClutterContext *context = clutter_actor_get_context (self);
+  PangoContext *pango_context;
 
-  font_map = COGL_PANGO_FONT_MAP (clutter_get_font_map ());
+  font_map = clutter_context_get_pango_fontmap (context);
 
-  context = cogl_pango_font_map_create_context (font_map);
-  update_pango_context (clutter_get_default_backend (), context);
-  pango_context_set_language (context, pango_language_get_default ());
+  pango_context = cogl_pango_font_map_create_context (font_map);
+  update_pango_context (clutter_get_default_backend (), pango_context);
+  pango_context_set_language (pango_context, pango_language_get_default ());
 
-  return context;
+  return pango_context;
 }
 
 /**
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 86b555be8..9a971ce23 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -576,22 +576,6 @@ clutter_stage_process_event (ClutterStage *stage,
   context->current_event = g_slist_delete_link (context->current_event, context->current_event);
 }
 
-/**
- * clutter_get_font_map:
- *
- * Retrieves the #PangoFontMap instance used by Clutter.
- * You can use the global font map object with the COGL
- * Pango API.
- *
- * Return value: (transfer none): the #PangoFontMap instance. The returned
- *   value is owned by Clutter and it should never be unreferenced.
- */
-PangoFontMap *
-clutter_get_font_map (void)
-{
-  return PANGO_FONT_MAP (clutter_context_get_pango_fontmap (ClutterCntx));
-}
-
 typedef struct _ClutterRepaintFunction
 {
   guint id;
diff --git a/clutter/clutter/clutter-main.h b/clutter/clutter/clutter-main.h
index b5884f35b..a07f644b8 100644
--- a/clutter/clutter/clutter-main.h
+++ b/clutter/clutter/clutter-main.h
@@ -138,9 +138,6 @@ guint                   clutter_threads_add_repaint_func_full   (ClutterRepaintF
 CLUTTER_EXPORT
 void                    clutter_threads_remove_repaint_func     (guint          handle_id);
 
-CLUTTER_EXPORT
-PangoFontMap *          clutter_get_font_map                    (void);
-
 CLUTTER_EXPORT
 ClutterTextDirection    clutter_get_default_text_direction      (void);