From 339948fcf2d59649e47a21897af51b1b07fb1043 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 2 Jan 2006 18:48:30 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20from=20Bj=C3=B6rn=20Lindqvist=20to=20fi?= =?UTF-8?q?x=20a=20logic=20error.=20#322149.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-01-02 Elijah Newren Patch from Björn Lindqvist to fix a logic error. #322149. * src/window.c (update_resize): && should have been ||. --- ChangeLog | 7 ++++++- src/window.c | 7 ++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa44e07c8..81a3458b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-02 Elijah Newren + + Patch from Björn Lindqvist to fix a logic error. #322149. + + * src/window.c (update_resize): && should have been ||. + 2006-01-02 Elijah Newren Patch from Jens Granseuer to fix build with gcc 2.95. #322622. @@ -18,7 +24,6 @@ * src/window.c (meta_window_new_with_attrs, meta_window_apply_session_info, meta_window_resize, meta_window_resize_with_gravity, meta_window_configure_request): - Remove C99 style variable initiailization 2006-01-02 Elijah Newren diff --git a/src/window.c b/src/window.c index f0e6f5ac6..c558f30ea 100644 --- a/src/window.c +++ b/src/window.c @@ -6894,11 +6894,8 @@ update_resize (MetaWindow *window, } /* Store the latest resize time, if we actually resized. */ - if (window->rect.width != old.width && - window->rect.height != old.height) - { - g_get_current_time (&window->display->grab_last_moveresize_time); - } + if (window->rect.width != old.width || window->rect.height != old.height) + g_get_current_time (&window->display->grab_last_moveresize_time); } typedef struct