From 5f25ca0c3a44c703f7f45ee3198683ecb7bd4528 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 10 Jul 2014 16:27:30 -0400
Subject: [PATCH] stack-tracker: More small cleanups

---
 src/core/stack-tracker.c | 11 ++---------
 src/core/util.c          |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c
index ad1763bdb..c692dda8f 100644
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -1029,8 +1029,6 @@ static void
 stack_tracker_event_received (MetaStackTracker *tracker,
 			      MetaStackOp      *op)
 {
-  gboolean verified;
-
   /* If the event is older than our latest requery, then it's
    * already included in our tree. Just ignore it. */
   if (op->any.serial < tracker->xserver_serial)
@@ -1051,13 +1049,8 @@ stack_tracker_event_received (MetaStackTracker *tracker,
    */
   meta_stack_op_apply (op, tracker->xserver_stack);
 
-  verified = stack_tracker_verify_predictions (tracker, op);
-  if (!verified)
-    {
-      resync_verified_stack_with_xserver_stack (tracker);
-      meta_stack_tracker_dump (tracker);
-      return;
-    }
+  if (!stack_tracker_verify_predictions (tracker, op))
+    resync_verified_stack_with_xserver_stack (tracker);
 
   meta_stack_tracker_dump (tracker);
 }
diff --git a/src/core/util.c b/src/core/util.c
index ccc1d154f..a1b129a99 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -49,7 +49,7 @@ meta_topic_real_valist (MetaDebugTopic topic,
                         va_list        args);
 #endif
 
-static gint verbose_topics = 0;
+static gint verbose_topics = META_DEBUG_STACK;
 static gboolean is_debugging = FALSE;
 static gboolean replace_current = FALSE;
 static int no_prefix = 0;