From 9fe845581b383e64d8c323a0c47f913ea2e04d2f Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren gmail com>
Date: Tue, 8 Aug 2006 00:36:04 +0000
Subject: [PATCH] =?UTF-8?q?patch=20from=20St=C3=A9phane=20Rosi=20to=20allo?=
 =?UTF-8?q?w=20moving=20maximized=20windows=20between?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2006-08-07  Elijah Newren  <newren gmail com>

	* src/constraints.c (setup_constraint_info): patch from Stéphane
	Rosi to allow moving maximized windows between xineramas again.
	#323820
---
 ChangeLog         | 6 ++++++
 src/constraints.c | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c8a34693..c577ef7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Elijah Newren  <newren gmail com>
+
+	* src/constraints.c (setup_constraint_info): patch from Stéphane
+	Rosi to allow moving maximized windows between xineramas again.
+	#323820
+
 2006-08-07  Elijah Newren  <newren gmail com>
 
 	* configure.in: post-release version bump to 2.15.34
diff --git a/src/constraints.c b/src/constraints.c
index 8eb2d83d8..1638203fa 100644
--- a/src/constraints.c
+++ b/src/constraints.c
@@ -385,10 +385,11 @@ setup_constraint_info (ConstraintInfo      *info,
   if (!info->is_user_action)
     info->fixed_directions = 0;
 
-  meta_window_get_work_area_current_xinerama (window, &info->work_area_xinerama);
-
   xinerama_info =
-    meta_screen_get_xinerama_for_window (window->screen, window);
+    meta_screen_get_xinerama_for_rect (window->screen, &info->current);
+  meta_window_get_work_area_for_xinerama (window,
+                                          xinerama_info->number,
+                                          &info->work_area_xinerama);
   info->entire_xinerama = xinerama_info->rect;
 
   cur_workspace = window->screen->active_workspace;