[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: correctly guard the new lines from the previous commit.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 25 16:36:45 CET 2017


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 40be528ffbc5ac9d421fafee752af88372962009
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 25 16:36:24 2017 +0100

    src/onmainwindow.cpp: correctly guard the new lines from the previous commit.
    
    Fixes compile issues on Linux and other systems.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index daaed7d..fad063a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -555,6 +555,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
       pulseManagerThread member variables. Fixes crashes on OS X and Windows
       if X2Go Client terminates before these objects have been created at run
       time (for instance when running x2goclient --help.)
+    - src/onmainwindow.cpp: correctly guard the new lines from the previous
+      commit. Fixes compile issues on Linux and other systems.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index a7616c9..604d25d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -203,8 +203,10 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     embedControlChanged=false;
     statusString=tr ( "connecting" );
 
+#if defined (Q_OS_DARWIN) || defined (Q_OS_WIN)
     pulseManager = NULL;
     pulseManagerThread = NULL;
+#endif /* defined (Q_OS_DARWIN) || defined (Q_OS_WIN) */
 
 
     hide();

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


More information about the x2go-commits mailing list