metacity r3605 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Tue Feb 26 20:47:29 2008
New Revision: 3605
URL: http://svn.gnome.org/viewvc/metacity?rev=3605&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/src/core/constraints.c

Modified: trunk/src/core/constraints.c
==============================================================================
--- trunk/src/core/constraints.c	(original)
+++ trunk/src/core/constraints.c	Tue Feb 26 20:47:29 2008
@@ -811,6 +811,7 @@
   int bh, hi, bw, wi, extra_height, extra_width;
   int new_width, new_height;
   gboolean constraint_already_satisfied;
+  MetaRectangle *start_rect;
 
   if (priority > PRIORITY_SIZE_HINTS_INCREMENTS)
     return TRUE;
@@ -855,7 +856,6 @@
   /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
    * See bug 448183
    */
-  MetaRectangle *start_rect;
   if (info->action_type == ACTION_MOVE_AND_RESIZE)
     start_rect = &info->current;
   else
@@ -879,6 +879,7 @@
   MetaRectangle min_size, max_size;
   gboolean too_big, too_small, constraint_already_satisfied;
   int new_width, new_height;
+  MetaRectangle *start_rect;
 
   if (priority > PRIORITY_SIZE_HINTS_LIMITS)
     return TRUE;
@@ -911,7 +912,6 @@
   /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
    * See bug 448183
    */
-  MetaRectangle *start_rect;
   if (info->action_type == ACTION_MOVE_AND_RESIZE)
     start_rect = &info->current;
   else
@@ -936,6 +936,7 @@
   int fudge, new_width, new_height;
   double best_width, best_height;
   double alt_width, alt_height;
+  MetaRectangle *start_rect;
 
   if (priority > PRIORITY_ASPECT_RATIO)
     return TRUE;
@@ -1044,7 +1045,6 @@
   /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
    * See bug 448183
    */
-  MetaRectangle *start_rect;
   if (info->action_type == ACTION_MOVE_AND_RESIZE)
     start_rect = &info->current;
   else