metacity r3786 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sun Jul 13 05:27:13 2008
New Revision: 3786
URL: http://svn.gnome.org/viewvc/metacity?rev=3786&view=rev

Log:
2008-07-12  Thomas Thurman  <tthurman gnome org>

        * src/core/constraints.c (do_screen_and_xinerama_relative_constraints):
        Don't allocate memory for log messages unless we're logging.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/src/core/constraints.c

Modified: trunk/src/core/constraints.c
==============================================================================
--- trunk/src/core/constraints.c	(original)
+++ trunk/src/core/constraints.c	Sun Jul 13 05:27:13 2008
@@ -1070,13 +1070,16 @@
   MetaRectangle how_far_it_can_be_smushed, min_size, max_size;
 
 #ifdef WITH_VERBOSE_MODE
-  /* First, log some debugging information */
-  char spanning_region[1 + 28 * g_list_length (region_spanning_rectangles)];
+  if (meta_is_verbose ())
+    {
+      /* First, log some debugging information */
+      char spanning_region[1 + 28 * g_list_length (region_spanning_rectangles)];
 
-  meta_topic (META_DEBUG_GEOMETRY,
-              "screen/xinerama constraint; region_spanning_rectangles: %s\n",
-              meta_rectangle_region_to_string (region_spanning_rectangles, ", ", 
-                                               spanning_region));
+      meta_topic (META_DEBUG_GEOMETRY,
+             "screen/xinerama constraint; region_spanning_rectangles: %s\n",
+             meta_rectangle_region_to_string (region_spanning_rectangles, ", ",
+                                              spanning_region));
+    }
 #endif
 
   /* Determine whether constraint applies; exit if it doesn't */