From 45b970f25634519dac302a5691a7a2d45f8db49f Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Mon, 10 Oct 2011 17:58:56 +0200
Subject: Imported nxagent-3.3.0-6.tar.gz

Summary: Imported nxagent-3.3.0-6.tar.gz
Keywords:

Imported nxagent-3.3.0-6.tar.gz
into Git repository
---
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 39 ++++++++++----------------
 1 file changed, 15 insertions(+), 24 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index f73d4692c..ce3e6ee05 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -257,11 +257,7 @@ TODO: This should be reset only when
 
       if ((dispatchException & DE_TERMINATE) == 0)
       {
-        #ifdef NX_DEBUG_INPUT
-        fprintf(stderr, "Session: Session suspended at '%s' timestamp [%lu].\n", GetTimeAsString(), GetTimeInMillis());
-        #else
         fprintf(stderr, "Session: Session suspended at '%s'.\n", GetTimeAsString());
-        #endif
       }
 
       nxagentResetDisplayHandlers();
@@ -551,29 +547,28 @@ Bool nxagentReconnectSession(void)
     goto nxagentReconnectError;
   }
 
-  if (nxagentOption(ResetKeyboardAtResume) == 1 &&
-         (nxagentKeyboard  == NULL || nxagentOldKeyboard == NULL ||
-             strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 ||
-                 strcmp(nxagentKeyboard, "query") == 0))
+  if (nxagentOption(ResetKeyboardAtResume))
   {
-    if (nxagentResetKeyboard() == 0)
+    if (nxagentKeyboard  == NULL || nxagentOldKeyboard == NULL ||
+           strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 ||
+               strcmp(nxagentKeyboard, "query") == 0)
     {
-      #ifdef WARNING
-      if (nxagentVerbose == 1)
+
+      if (nxagentResetKeyboard() == 0)
       {
-        fprintf(stderr, "nxagentReconnect: Failed to reset keyboard device.\n");
-      }
-      #endif
+        #ifdef WARNING
+        if (nxagentVerbose == 1)
+        {
+          fprintf(stderr, "nxagentReconnect: Failed to reset keyboard device.\n");
+        }
+        #endif
 
-      failedStep = WINDOW_STEP;
+        failedStep = WINDOW_STEP;
 
-      goto nxagentReconnectError;
+        goto nxagentReconnectError;
+      }
     }
   }
-  else
-  {
-    nxagentResetKeycodeConversion();
-  }
 
   nxagentXkbState.Initialized = 0;
 
@@ -613,11 +608,7 @@ Bool nxagentReconnectSession(void)
     goto nxagentReconnectError;
   }
 
-  #ifdef NX_DEBUG_INPUT
-  fprintf(stderr, "Session: Session resumed at '%s' timestamp [%lu].\n", GetTimeAsString(), GetTimeInMillis());
-  #else
   fprintf(stderr, "Session: Session resumed at '%s'.\n", GetTimeAsString());
-  #endif
 
   nxagentRemoveSplashWindow(NULL);
 
-- 
cgit v1.2.3