From 95ce6b74b70f9d9645a07e03eed9a8004ba7c8cc Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 13 Nov 2011 09:27:52 +0100
Subject: Imported nxcomp-3.3.0-3.tar.gz

Summary: Imported nxcomp-3.3.0-3.tar.gz
Keywords:

Imported nxcomp-3.3.0-3.tar.gz
into Git repository
---
 nxcomp/CHANGELOG         | 13 +++++++++++++
 nxcomp/ClientChannel.cpp | 19 +++++++++++++++++++
 nxcomp/VERSION           |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index 6a26f6626..f038665d2 100755
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,18 @@
 ChangeLog:
 
+nxcomp-3.3.0-3
+
+- Removed a condition in ClientChannel that caused a loss in event
+  sequence numbers.
+
+nxcomp-3.3.0-2
+
+- Updated VERSION.
+
+nxcomp-3.3.0-1
+
+- Opened the 3.3.0 branch based on nxcomp-3.2.0-7.
+
 nxcomp-3.2.0-7
 
 - Solved a compilation problem on GCC 4.3.
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
index e69a8794a..f93156a17 100755
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -4539,6 +4539,24 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
             lastSequence_ = serverSequence_;
           }
         }
+/*
+FIXME: This block was added, otherwise we have a loss
+       of the nxagent events.
+*/
+        else
+        {
+          #ifdef DEBUG
+          *logofs << "handleWrite: Updating last event's sequence "
+                  << lastSequence_ << " to X server's sequence number "
+                  << serverSequence_ << " for FD#" << fd_
+                  << ".\n" << logofs_flush;
+          #endif
+
+          lastSequence_ = serverSequence_;
+        }
+
+/*
+FIXME: This causes the loss of the nxagent events.
 
         //
         // Check if by producing events at client side we
@@ -4571,6 +4589,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
                   << logofs_flush;
         }
         #endif
+*/
 
         //
         // Check if remote side used fast encoding.
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
index 944880fa1..15a279981 100755
--- a/nxcomp/VERSION
+++ b/nxcomp/VERSION
@@ -1 +1 @@
-3.2.0
+3.3.0
-- 
cgit v1.2.3