[X2Go-Commits] [x2goclient] 01/01: {debian/changelog, src/onmainwindow.cpp}: fixup last commit. Spelling errors, changelog format, unclear blocks.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit b9822f4088ae6a433c0301b5f3532e4ee671e13d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jul 7 21:03:51 2015 +0200

    {debian/changelog,src/onmainwindow.cpp}: fixup last commit. Spelling errors, changelog format, unclear blocks.
---
 debian/changelog     |    5 +++--
 src/onmainwindow.cpp |    7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2758813..06d67a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -89,8 +89,9 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
       cross compiling. Fixes: #901.
 
   [ Oleksandr Shneyder ]
-    - Fixing multimonitor mode on Windows. Run VcXsrv with on selected screen
-      without decoration.
+  * New upstream release (4.0.4.1):
+    - onmainwindow.{cpp,h}: fix multimonitor mode on Windows. Run VcXsrv on
+      selected screen without decorations.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 5236748..569ccc1 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5401,11 +5401,14 @@ void ONMainWindow::slotTunnelOk(int)
 
     nxproxy->start ( proxyCmd );
     proxyRunning=true;
-//allways search for proxy window on linux. On Windows only in window mode
+// always search for proxy window on linux. On Windows only in window mode
 #ifdef Q_OS_WIN
-    if(xorgMode==WIN)
+    if (xorgMode==WIN) {
 #endif
     proxyWinTimer->start ( 300 );
+#ifdef Q_OS_WIN
+    }
+#endif
     if ( embedMode )
     {
 //         proxyWinTimer->start ( 300 );

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git