From 7c2e926c44a2d413154cde0c4ae727d4880f9033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Sun, 13 Oct 2019 16:46:47 +0200
Subject: [PATCH] core/core: Remove meta_retheme_all() helper

All it did was get the MetaDisplay and call a function on it.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/854
---
 src/core/core.c            | 7 -------
 src/core/core.h            | 2 --
 src/core/display-private.h | 1 -
 src/core/display.c         | 6 ------
 src/core/main.c            | 2 +-
 src/ui/frames.c            | 2 +-
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/core/core.c b/src/core/core.c
index 5c2b8e428..81034b2ff 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -276,10 +276,3 @@ meta_core_set_screen_cursor (Display *xdisplay,
 
   meta_frame_set_screen_cursor (window->frame, cursor);
 }
-
-void
-meta_retheme_all (void)
-{
-  if (meta_get_display ())
-    meta_display_retheme_all ();
-}
diff --git a/src/core/core.h b/src/core/core.h
index 47194da37..fa547f847 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -77,6 +77,4 @@ void       meta_core_set_screen_cursor (Display *xdisplay,
                                         Window   frame_on_screen,
                                         MetaCursor cursor);
 
-void meta_retheme_all (void);
-
 #endif
diff --git a/src/core/display-private.h b/src/core/display-private.h
index ae8bb2ba6..1541a6318 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -337,7 +337,6 @@ const char* meta_event_mode_to_string   (int m);
 const char* meta_event_detail_to_string (int d);
 
 void meta_display_queue_retheme_all_windows (MetaDisplay *display);
-void meta_display_retheme_all (void);
 
 void meta_display_ping_window      (MetaWindow  *window,
                                     guint32      serial);
diff --git a/src/core/display.c b/src/core/display.c
index c2a48492c..24009b153 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1969,12 +1969,6 @@ meta_display_queue_retheme_all_windows (MetaDisplay *display)
   g_slist_free (windows);
 }
 
-void
-meta_display_retheme_all (void)
-{
-  meta_display_queue_retheme_all_windows (meta_get_display ());
-}
-
 /*
  * Stores whether syncing is currently enabled.
  */
diff --git a/src/core/main.c b/src/core/main.c
index 3935f3523..16aa8736a 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -717,7 +717,7 @@ prefs_changed_callback (MetaPreference pref,
   switch (pref)
     {
     case META_PREF_DRAGGABLE_BORDER_WIDTH:
-      meta_display_retheme_all ();
+      meta_display_queue_retheme_all_windows (meta_get_display ());
       break;
 
     default:
diff --git a/src/ui/frames.c b/src/ui/frames.c
index ecb38a9f7..1cb46f7eb 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -336,7 +336,7 @@ meta_frames_style_updated  (GtkWidget *widget)
 
   g_hash_table_foreach (frames->frames, reattach_style_func, NULL);
 
-  meta_retheme_all ();
+  meta_display_queue_retheme_all_windows (meta_get_display ());
 
   GTK_WIDGET_CLASS (meta_frames_parent_class)->style_updated (widget);
 }