[metacity] ui-frames: Delay attaching the style to new frames

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

commit ee0568531ccdad69ea095b3c80742b332e607d83
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Mar 20 23:20:51 2011 +0100

    ui-frames: Delay attaching the style to new frames
    
    Like the setting of new frames' background is delayed until the
    frame is associated with its window, delay attaching the initial
    style, so that the correct style variant is picked.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=645355

 src/core/frame.c |    3 ++-
 src/ui/frames.c  |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/core/frame.c b/src/core/frame.c
index ac5cfcf..76f7979 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -146,8 +146,9 @@ meta_window_ensure_frame (MetaWindow *window)
   window->frame = frame;
 
   /* Now that frame->xwindow is registered with window, we can set its
-   * background.
+   * style and background.
    */
+  meta_ui_update_frame_style (window->screen->ui, frame->xwindow);
   meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
 
   if (window->title)
diff --git a/src/ui/frames.c b/src/ui/frames.c
index c21c5cc..db189f0 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -592,7 +592,6 @@ meta_frames_manage_window (MetaFrames *frames,
   gdk_window_set_user_data (frame->window, frames);
 
   frame->style = NULL;
-  meta_frames_attach_style (frames, frame);
 
   /* Don't set event mask here, it's in frame.c */