[metacity] display: reapply shape after compositor change

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 6db0f6cbf6e76714bc844841cfc52773b3a853d8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Mar 12 13:14:00 2017 +0200

    display: reapply shape after compositor change

 src/core/display.c |    1 +
 src/core/frame.c   |   18 ------------------
 2 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 1ecdc3e..c09cb58 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -5208,6 +5208,7 @@ prefs_changed_callback (MetaPreference pref,
   else if (pref == META_PREF_COMPOSITING_MANAGER)
     {
       update_compositor (display, TRUE);
+      meta_display_retheme_all ();
     }
   else if (pref == META_PREF_THEME_NAME ||
            pref == META_PREF_THEME_TYPE)
diff --git a/src/core/frame.c b/src/core/frame.c
index 8d4644d..c4387a5 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -30,7 +30,6 @@
 #include "bell.h"
 #include "errors.h"
 #include "keybindings.h"
-#include "prefs.h"
 
 #define EVENT_MASK (SubstructureRedirectMask |                     \
                     StructureNotifyMask | SubstructureNotifyMask | \
@@ -68,19 +67,6 @@ update_input_shape (MetaFrame *frame)
   XFixesDestroyRegion (xdisplay, region);
 }
 
-static void
-prefs_changed_callback (MetaPreference preference,
-                        gpointer       data)
-{
-  MetaFrame *frame = (MetaFrame *) data;
-
-  if (preference == META_PREF_COMPOSITING_MANAGER)
-    {
-      frame->need_reapply_frame_shape = TRUE;
-      update_shape (frame);
-    }
-}
-
 void
 meta_window_ensure_frame (MetaWindow *window)
 {
@@ -190,8 +176,6 @@ meta_window_ensure_frame (MetaWindow *window)
   update_shape (frame);
 
   meta_display_ungrab (window->display);
-
-  meta_prefs_add_listener (prefs_changed_callback, frame);
 }
 
 void
@@ -207,8 +191,6 @@ meta_window_destroy_frame (MetaWindow *window)
 
   frame = window->frame;
 
-  meta_prefs_remove_listener (prefs_changed_callback, frame);
-
   meta_frame_calc_borders (frame, &borders);
 
   meta_bell_notify_frame_destroy (frame);