summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/place.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f44999cb..1bd442be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-02 Brent Smith <gnome@nextreality.net>
+
+ * src/place.c: (meta_window_place): Moved the call to
+ meta_screen_get_natural_xinerama_list to earlier in
+ function so that xineramas_list is allocated before
+ find_first_fit is called. Fixes #315000
+
2005-08-22 Elijah Newren <newren@gmail.com>
* configure.in: post-release version bump to 2.11.5
diff --git a/src/place.c b/src/place.c
index d4b41804..5620be2a 100644
--- a/src/place.c
+++ b/src/place.c
@@ -853,6 +853,10 @@ meta_window_place (MetaWindow *window,
goto done;
}
}
+
+ meta_screen_get_natural_xinerama_list (window->screen,
+ &xineramas_list,
+ &n_xineramas);
/* FIXME UTILITY with transient set should be stacked up
* on the sides of the parent window or something.
@@ -917,10 +921,6 @@ meta_window_place (MetaWindow *window,
x = xi->x_origin;
y = xi->y_origin;
- meta_screen_get_natural_xinerama_list (window->screen,
- &xineramas_list,
- &n_xineramas);
-
if (find_first_fit (window, fgeom, windows,
xineramas_list, n_xineramas,
x, y, &x, &y))