On 06/04/2010 09:58 PM, Jeremy Huddleston wrote:

This fixes a regression in miext/rootless from 
643cb6e87c10ab554c03ada81930001a8ebcc909

Whoops.

Reviewed-by: Pierre-Loup A. Griffais <[email protected]>


Found-by: tinderbox
Signed-off-by: Jeremy Huddleston<[email protected]>

---
  miext/rootless/rootlessWindow.c |    4 ++--
  miext/rootless/rootlessWindow.h |    2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index ce088c7..4d541f4 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -288,12 +288,12 @@ static void RootlessReshapeFrame(WindowPtr pWin)
   *  shaped when the window is framed.
   */
  void
-RootlessSetShape(WindowPtr pWin)
+RootlessSetShape(WindowPtr pWin, int kind)
  {
      ScreenPtr pScreen = pWin->drawable.pScreen;

      SCREEN_UNWRAP(pScreen, SetShape);
-    pScreen->SetShape(pWin);
+    pScreen->SetShape(pWin, kind);
      SCREEN_WRAP(pScreen, SetShape);

      RootlessReshapeFrame(pWin);
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index ca104a4..2b018e0 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -39,7 +39,7 @@
  Bool RootlessCreateWindow(WindowPtr pWin);
  Bool RootlessDestroyWindow(WindowPtr pWin);

-void RootlessSetShape(WindowPtr pWin);
+void RootlessSetShape(WindowPtr pWin, int kind);

  Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask);
  Bool RootlessPositionWindow(WindowPtr pWin, int x, int y);
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to