diff options
| author | Elijah Newren <newren gmail com> | 2006-01-20 23:02:24 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2006-01-20 23:02:24 +0000 |
| commit | 6f318f1a751bfb6e0d77ff2f9794602d2d70b1e6 (patch) | |
| tree | 58ebca68089902e55612e859dcbbd591dcbf91da | |
| parent | 5568f75cb05e9f1886596059eec111a2fd66bc35 (diff) | |
| download | metacity-6f318f1a751bfb6e0d77ff2f9794602d2d70b1e6.tar.gz | |
Fix unitialized value problem when in raise-on-click mode. Søren,
2006-01-20 Elijah Newren <newren gmail com>
Fix unitialized value problem when in raise-on-click mode. Søren,
#327572.
* src/display.c (meta_display_check_threshold_reached): make
function be a no op if raise_on_click!=FALSE
* src/display.h (struct MetaDisplay): point out that
grab_initial_[xy] and grab_threshold_movement_reached are only for
raise_on_click==FALSE mode.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/display.c | 3 | ||||
| -rw-r--r-- | src/display.h | 4 |
3 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,17 @@ 2006-01-20 Elijah Newren <newren gmail com> + Fix unitialized value problem when in raise-on-click mode. Søren, + #327572. + + * src/display.c (meta_display_check_threshold_reached): make + function be a no op if raise_on_click!=FALSE + + * src/display.h (struct MetaDisplay): point out that + grab_initial_[xy] and grab_threshold_movement_reached are only for + raise_on_click==FALSE mode. + +2006-01-20 Elijah Newren <newren gmail com> + Patch from Søren to fix some reading-from-free'd-data errors. #327575 diff --git a/src/display.c b/src/display.c index aa602f2a..0c1a6e36 100644 --- a/src/display.c +++ b/src/display.c @@ -3616,7 +3616,8 @@ meta_display_check_threshold_reached (MetaDisplay *display, int y) { /* Don't bother doing the check again if we've already reached the threshold */ - if (display->grab_threshold_movement_reached) + if (display->grab_threshold_movement_reached || + meta_prefs_get_raise_on_click ()) return; if (ABS (display->grab_initial_x - x) >= 8 || diff --git a/src/display.h b/src/display.h index 54e5c901..ca74f19c 100644 --- a/src/display.h +++ b/src/display.h @@ -269,8 +269,8 @@ struct _MetaDisplay MetaRectangle grab_wireframe_rect; MetaRectangle grab_wireframe_last_xor_rect; MetaRectangle grab_initial_window_pos; - int grab_initial_x, grab_initial_y; - gboolean grab_threshold_movement_reached; + int grab_initial_x, grab_initial_y; /* These are only relevant for */ + gboolean grab_threshold_movement_reached; /* raise_on_click == FALSE. */ MetaResizePopup *grab_resize_popup; GTimeVal grab_last_moveresize_time; Time grab_motion_notify_time; |