isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

reorder declarations so we don't break C89 compilers. Closes #518917.

Browse Source 
2008-02-26  Jens Granseuer  <jensgr@gmx.net>

        * src/core/constraints.c (constrain_aspect_ratio,
	constrain_size_limits, constrain_size_increments):
	reorder declarations so we don't break C89 compilers.
	Closes #518917.


svn path=/trunk/; revision=3605
This commit is contained in:
Jens Granseuer 2008-02-26 20:47:29 +00:00 committed by Thomas James Alexander Thurman
parent 3d4adc8be9
commit 401b716cf5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-02-26 Jens Granseuer <jensgr@gmx.net>
* src/core/constraints.c (constrain_aspect_ratio,
constrain_size_limits, constrain_size_increments):
reorder declarations so we don't break C89 compilers.
Closes #518917.
2008-02-26 Thomas Thurman <tthurman@gnome.org> 2008-02-26 Thomas Thurman <tthurman@gnome.org>
* configure.in: Post-release bump to 2.23.1. * configure.in: Post-release bump to 2.23.1.

6
src/core/constraints.c
View File

@ -811,6 +811,7 @@ constrain_size_increments (MetaWindow *window,
int bh, hi, bw, wi, extra_height, extra_width; int bh, hi, bw, wi, extra_height, extra_width;
int new_width, new_height; int new_width, new_height;
gboolean constraint_already_satisfied; gboolean constraint_already_satisfied;
MetaRectangle *start_rect;
if (priority > PRIORITY_SIZE_HINTS_INCREMENTS) if (priority > PRIORITY_SIZE_HINTS_INCREMENTS)
return TRUE; return TRUE;
@ -855,7 +856,6 @@ constrain_size_increments (MetaWindow *window,
/* Figure out what original rect to pass to meta_rectangle_resize_with_gravity /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
* See bug 448183 * See bug 448183
*/ */
MetaRectangle *start_rect;
if (info->action_type == ACTION_MOVE_AND_RESIZE) if (info->action_type == ACTION_MOVE_AND_RESIZE)
start_rect = &info->current; start_rect = &info->current;
else else
@ -879,6 +879,7 @@ constrain_size_limits (MetaWindow *window,
MetaRectangle min_size, max_size; MetaRectangle min_size, max_size;
gboolean too_big, too_small, constraint_already_satisfied; gboolean too_big, too_small, constraint_already_satisfied;
int new_width, new_height; int new_width, new_height;
MetaRectangle *start_rect;
if (priority > PRIORITY_SIZE_HINTS_LIMITS) if (priority > PRIORITY_SIZE_HINTS_LIMITS)
return TRUE; return TRUE;
@ -911,7 +912,6 @@ constrain_size_limits (MetaWindow *window,
/* Figure out what original rect to pass to meta_rectangle_resize_with_gravity /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
* See bug 448183 * See bug 448183
*/ */
MetaRectangle *start_rect;
if (info->action_type == ACTION_MOVE_AND_RESIZE) if (info->action_type == ACTION_MOVE_AND_RESIZE)
start_rect = &info->current; start_rect = &info->current;
else else
@ -936,6 +936,7 @@ constrain_aspect_ratio (MetaWindow *window,
int fudge, new_width, new_height; int fudge, new_width, new_height;
double best_width, best_height; double best_width, best_height;
double alt_width, alt_height; double alt_width, alt_height;
MetaRectangle *start_rect;
if (priority > PRIORITY_ASPECT_RATIO) if (priority > PRIORITY_ASPECT_RATIO)
return TRUE; return TRUE;
@ -1044,7 +1045,6 @@ constrain_aspect_ratio (MetaWindow *window,
/* Figure out what original rect to pass to meta_rectangle_resize_with_gravity /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
* See bug 448183 * See bug 448183
*/ */
MetaRectangle *start_rect;
if (info->action_type == ACTION_MOVE_AND_RESIZE) if (info->action_type == ACTION_MOVE_AND_RESIZE)
start_rect = &info->current; start_rect = &info->current;
else else