[metacity] compositor: remove attrs parameter from add_window

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

commit 08ec43fb4e816f650c69628182676e7229976564
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Mar 1 23:48:35 2017 +0200

    compositor: remove attrs parameter from add_window

 src/compositor/meta-compositor-none.c    |    7 +++----
 src/compositor/meta-compositor-private.h |    3 +--
 src/compositor/meta-compositor-xrender.c |   11 +++++------
 src/compositor/meta-compositor.c         |    9 ++++-----
 src/core/display.c                       |   11 ++---------
 src/core/screen.c                        |    4 ++--
 src/include/meta-compositor.h            |    3 +--
 7 files changed, 18 insertions(+), 30 deletions(-)
---
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index 8147908..15d0af6 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -44,10 +44,9 @@ meta_compositor_none_unmanage (MetaCompositor *compositor)
 }
 
 static void
-meta_compositor_none_add_window (MetaCompositor    *compositor,
-                                 MetaWindow        *window,
-                                 Window             xwindow,
-                                 XWindowAttributes *attrs)
+meta_compositor_none_add_window (MetaCompositor *compositor,
+                                 MetaWindow     *window,
+                                 Window          xwindow)
 {
 }
 
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index 0d8feb0..69727ca 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -36,8 +36,7 @@ struct _MetaCompositorClass
 
   void              (* add_window)         (MetaCompositor     *compositor,
                                             MetaWindow         *window,
-                                            Window              xwindow,
-                                            XWindowAttributes  *attrs);
+                                            Window              xwindow);
 
   void              (* remove_window)      (MetaCompositor     *compositor,
                                             MetaWindow         *window);
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 0495d35..1cf8a8d 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -3222,16 +3222,15 @@ meta_compositor_xrender_unmanage (MetaCompositor *compositor)
 }
 
 static void
-meta_compositor_xrender_add_window (MetaCompositor    *compositor,
-                                    MetaWindow        *window,
-                                    Window             xwindow,
-                                    XWindowAttributes *attrs)
+meta_compositor_xrender_add_window (MetaCompositor *compositor,
+                                    MetaWindow     *window,
+                                    Window          xwindow)
 {
   MetaCompositorXRender *xrender = META_COMPOSITOR_XRENDER (compositor);
-  MetaScreen *screen = meta_screen_for_x_screen (attrs->screen);
+  MetaDisplay *display = meta_compositor_get_display (compositor);
 
   meta_error_trap_push (NULL);
-  add_win (xrender, screen, window, xwindow);
+  add_win (xrender, display->screen, window, xwindow);
   meta_error_trap_pop (NULL);
 }
 
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index 24dec53..5ec869d 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -204,16 +204,15 @@ meta_compositor_unmanage (MetaCompositor *compositor)
 }
 
 void
-meta_compositor_add_window (MetaCompositor    *compositor,
-                            MetaWindow        *window,
-                            Window             xwindow,
-                            XWindowAttributes *attrs)
+meta_compositor_add_window (MetaCompositor *compositor,
+                            MetaWindow     *window,
+                            Window          xwindow)
 {
   MetaCompositorClass *compositor_class;
 
   compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
 
-  compositor_class->add_window (compositor, window, xwindow, attrs);
+  compositor_class->add_window (compositor, window, xwindow);
 }
 
 void
diff --git a/src/core/display.c b/src/core/display.c
index a29ccee..02fb328 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2074,20 +2074,13 @@ event_callback (XEvent   *event,
       if (window == NULL)
         {
           Window xwindow;
-          XWindowAttributes attr;
-          int result;
 
           xwindow = event->xmaprequest.window;
           window = meta_window_new (display, xwindow, FALSE);
 
-          meta_error_trap_push (display);
-          result = XGetWindowAttributes (display->xdisplay, xwindow, &attr);
-          meta_error_trap_pop (display);
-
-          if (result != 0)
+          if (window != NULL)
             {
-              meta_compositor_add_window (display->compositor, window,
-                                          xwindow, &attr);
+              meta_compositor_add_window (display->compositor, window, xwindow);
             }
         }
       /* if frame was receiver it's some malicious send event or something */
diff --git a/src/core/screen.c b/src/core/screen.c
index a321af4..ea9db24 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -786,7 +786,7 @@ meta_screen_manage_all_windows (MetaScreen *screen)
       }
 
       meta_compositor_add_window (screen->display->compositor, window,
-                                  info->xwindow, &info->attrs);
+                                  info->xwindow);
     }
   meta_stack_thaw (screen->stack);
 
@@ -823,7 +823,7 @@ meta_screen_composite_all_windows (MetaScreen *screen)
 
       window = meta_display_lookup_x_window (display, info->xwindow);
       meta_compositor_add_window (display->compositor, window,
-                                  info->xwindow, &info->attrs);
+                                  info->xwindow);
     }
 
   meta_stack_thaw (screen->stack);
diff --git a/src/include/meta-compositor.h b/src/include/meta-compositor.h
index 34e76df..53b6568 100644
--- a/src/include/meta-compositor.h
+++ b/src/include/meta-compositor.h
@@ -46,8 +46,7 @@ void             meta_compositor_unmanage           (MetaCompositor     *composi
 
 void             meta_compositor_add_window         (MetaCompositor     *compositor,
                                                      MetaWindow         *window,
-                                                     Window              xwindow,
-                                                     XWindowAttributes  *attrs);
+                                                     Window              xwindow);
 
 void             meta_compositor_remove_window      (MetaCompositor     *compositor,
                                                      MetaWindow         *window);