summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/core/constraints.c15
2 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e26ec05..4752e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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.
+
+2008-07-12 Thomas Thurman <tthurman@gnome.org>
+
* src/core/group.c (meta_window_get_group): This function can now
officially return NULL.
* src/core/window.c (meta_window_same_application): Two windows can't
diff --git a/src/core/constraints.c b/src/core/constraints.c
index 54dc794..a7601a7 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -1070,13 +1070,16 @@ do_screen_and_xinerama_relative_constraints (
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 */