From d1a588a94fba75c21a6b26b30a73c2087ad0c4e5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 10 Jul 2014 15:58:46 -0400 Subject: [PATCH] stack-tracker: Fix the case where the serial is too old The code here before was just flat out wrong, and made us consistently requery the server at startup. --- src/core/stack-tracker.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c index a10506bf2..9e992418f 100644 --- a/src/core/stack-tracker.c +++ b/src/core/stack-tracker.c @@ -1037,15 +1037,12 @@ stack_tracker_event_received (MetaStackTracker *tracker, gboolean need_sync = FALSE; gboolean verified; - meta_stack_op_dump (op, "Stack op event received: ", "\n"); - + /* 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) - { - /* g_warning ("Spurious X event received affecting stack; doing full re-query"); */ - resync_verified_stack_with_xserver_stack (tracker); - meta_stack_tracker_dump (tracker); - return; - } + return; + + meta_stack_op_dump (op, "Stack op event received: ", "\n"); tracker->xserver_serial = op->any.serial;