brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unitialized value problem when in raise-on-click mode. Søren,

Browse Source 
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.
This commit is contained in:
Elijah Newren 2006-01-20 23:02:24 +00:00 committed by Elijah Newren
parent 5568f75cb0
commit 6f318f1a75
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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> 2006-01-20 Elijah Newren <newren gmail com>
Patch from Søren to fix some reading-from-free'd-data errors. Patch from Søren to fix some reading-from-free'd-data errors.

3
src/display.c
View File

@ -3616,7 +3616,8 @@ meta_display_check_threshold_reached (MetaDisplay *display,
int y) int y)
{ {
/* Don't bother doing the check again if we've already reached the threshold */ /* 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; return;
if (ABS (display->grab_initial_x - x) >= 8 || if (ABS (display->grab_initial_x - x) >= 8 ||

4
src/display.h
View File

@ -269,8 +269,8 @@ struct _MetaDisplay
MetaRectangle grab_wireframe_rect; MetaRectangle grab_wireframe_rect;
MetaRectangle grab_wireframe_last_xor_rect; MetaRectangle grab_wireframe_last_xor_rect;
MetaRectangle grab_initial_window_pos; MetaRectangle grab_initial_window_pos;
int grab_initial_x, grab_initial_y; int grab_initial_x, grab_initial_y; /* These are only relevant for */
gboolean grab_threshold_movement_reached; gboolean grab_threshold_movement_reached; /* raise_on_click == FALSE. */
MetaResizePopup *grab_resize_popup; MetaResizePopup *grab_resize_popup;
GTimeVal grab_last_moveresize_time; GTimeVal grab_last_moveresize_time;
Time grab_motion_notify_time; Time grab_motion_notify_time;