brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stack-tracker: More small cleanups

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-10 16:27:30 -04:00
parent 41b4a079c7
commit 5f25ca0c3a
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/stack-tracker.c
View File

@ -1029,8 +1029,6 @@ static void
stack_tracker_event_received (MetaStackTracker *tracker, stack_tracker_event_received (MetaStackTracker *tracker,
MetaStackOp *op) MetaStackOp *op)
{ {
gboolean verified;
/* If the event is older than our latest requery, then it's /* If the event is older than our latest requery, then it's
* already included in our tree. Just ignore it. */ * already included in our tree. Just ignore it. */
if (op->any.serial < tracker->xserver_serial) 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); meta_stack_op_apply (op, tracker->xserver_stack);
verified = stack_tracker_verify_predictions (tracker, op); if (!stack_tracker_verify_predictions (tracker, op))
if (!verified) resync_verified_stack_with_xserver_stack (tracker);
{
resync_verified_stack_with_xserver_stack (tracker);
meta_stack_tracker_dump (tracker);
return;
}
meta_stack_tracker_dump (tracker); meta_stack_tracker_dump (tracker);
} }

2
src/core/util.c
View File

@ -49,7 +49,7 @@ meta_topic_real_valist (MetaDebugTopic topic,
va_list args); va_list args);
#endif #endif
static gint verbose_topics = 0; static gint verbose_topics = META_DEBUG_STACK;
static gboolean is_debugging = FALSE; static gboolean is_debugging = FALSE;
static gboolean replace_current = FALSE; static gboolean replace_current = FALSE;
static int no_prefix = 0; static int no_prefix = 0;