x2goclient.git - master (branch) updated: 3.99.2.0-8-g74d2122 - x2go-commits

16 Apr 2012

The branch, master has been updated
       via  74d212292d0e8d085032aeb59c469b8f5155e74a (commit)
      from  c736df204c427849b1a4f512fd2113ceab723fa7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 74d212292d0e8d085032aeb59c469b8f5155e74a
Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
Date:   Mon Apr 16 13:20:18 2012 +0200

    Support recent pulseuadio on windows

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    3 ++-
 onmainwindow.cpp      |   10 +++++++++-
 onmainwindow_privat.h |    1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 34c0cd3..8819d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.99.2.1):
     - Not starting smart card daemon before users are loaded in LDAP mode.
     - Merging onmainwindow_part*.cpp into onmainwindow.cpp
+    - Support recent pulseuadio on windows
 
   [ Daniel Lindgren ]
   * New upstream version (3.99.2.1):
@@ -17,7 +18,7 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.99.2.1):
     - German i18n update for published applications.
 
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 04 Apr 2012 11:55:57 +0200
+ -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>  Mon, 16 Apr 2012 13:15:47 +0200
 
 x2goclient (3.99.2.0-0~x2go1) unstable; urgency=low
 
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 3af1156..d520df4 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -8582,7 +8582,15 @@ void ONMainWindow::startPulsed()
     pulseServer=new QProcess ( 0 );
     pulseServer->setEnvironment ( pEnv );
     QStringList args;
-    args<<"-n"<<"-F"<<pulseDir+"/config.pa";
+#ifdef Q_OS_WIN
+    QDir drr(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime");
+    if (!drr.exists())
+        drr.mkpath(drr.path());
+    pulseDir.replace("/","\\");
+    args<<"--exit-idle-time=-1"<<"-n"<<"-F"<<pulseDir+"\\config.pa";
+#else
+    args<<"--exit-idle-time=-1"<<"-n"<<"-F"<<pulseDir+"/config.pa";
+#endif
     pulseServer->setWorkingDirectory ( wapiShortFileName (
                                            appDir+"\\pulse" ) );
     pulseServer->start ( "pulse\\pulseaudio.exe",args );
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index 33a8bc4..1d6266d 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -144,6 +144,7 @@
 
 #ifdef Q_OS_WIN
 #include "wapi.h"
+#include <QHostInfo>
 #endif
 
 #ifdef Q_OS_LINUX


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).

    