[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: fix last commit by using QFileInfo instead of QDir.

[git-admin]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit a513cb08cb0b11bca40ef9ef767c06a7e6b534c7
Author: Mihai Moldovan 
Date:   Sat Aug 27 20:51:22 2016 +0200

src/onmainwindow.cpp: fix last commit by using QFileInfo instead of QDir.

This lets us use the exists () member function correctly.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 394a8dd..e3c5559 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   add_to_path ().
 - src/onmainwindow.cpp: work around changed SSH host key locations in OS X
   10.11+. Fixes: #1079. Also check /etc/ssh/ for keys.
+- src/onmainwindow.cpp: fix last commit by using QFileInfo instead of
+  QDir. This lets us use the exists () member function correctly.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index b4413f0..1042b58 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8061,10 +8061,10 @@ QString ONMainWindow::createRSAKey()
 #ifdef Q_OS_DARWIN
 {
 /* OS X 10.11+ changed the key location to /etc/ssh/. */
-QDir rsa_host_key ("/etc/ssh/ssh_host_rsa_key.pub");
+QFileInfo rsa_host_key ("/etc/ssh/ssh_host_rsa_key.pub");
 
 if (!(rsa_host_key.exists ())) {
-rsa_host_key = QDir ("/etc/ssh_host_rsa_key.pub");
+rsa_host_key = QFileInfo ("/etc/ssh_host_rsa_key.pub");
 
 if (!(rsa_host_key.exists ())) {
 printSshDError_noHostPubKey ();
@@ -8072,7 +8072,7 @@ QString ONMainWindow::createRSAKey()
 }
 }
 
-rsa.setFileName (rsa_host_key.absolutePath ());
+rsa.setFileName (rsa_host_key.absoluteFilePath ());
 }
 #endif
 if ( !rsa.open ( QIODevice::ReadOnly | QIODevice::Text ) )

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch master updated (742205c -> a513cb0)

[git-admin]

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

x2go pushed a change to branch master
in repository x2goclient.

  from  742205c   src/onmainwindow.cpp: work around changed SSH host key 
locations in OS X 10.11+. Fixes: #1079.
   new  a513cb0   src/onmainwindow.cpp: fix last commit by using QFileInfo 
instead of QDir.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |2 ++
 src/onmainwindow.cpp |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] Jenkins build is back to normal : x2goclient+nightly+debian-wheezy #413

[jenkins]

See 

___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] Jenkins build is back to normal : x2goclient+nightly+debian-sid #426

[jenkins]

See 

___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] Jenkins build is back to normal : x2goclient+nightly+debian-jessie #404

[jenkins]

See 

___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] Build failed in Jenkins: x2goclient+nightly+debian-wheezy #412

[jenkins]

See 


Changes:

[ionic] src/onmainwindow.cpp: work around changed SSH host key locations in OS X

--
[...truncated 266 lines...]
+++ ret=XX
+++ i=18
+++ '[' 18 -lt 24 ']'
 printf X
+++ ret=XXX
+++ i=19
+++ '[' 19 -lt 24 ']'
 printf X
+++ ret=
+++ i=20
+++ '[' 20 -lt 24 ']'
 printf X
+++ ret=X
+++ i=21
+++ '[' 21 -lt 24 ']'
 printf X
+++ ret=XX
+++ i=22
+++ '[' 22 -lt 24 ']'
 printf X
+++ ret=XXX
+++ i=23
+++ '[' 23 -lt 24 ']'
 printf X
+++ ret=
+++ i=24
+++ '[' 24 -lt 24 ']'
+++ printf 
+++ return 0
++ mktemp -d --tmpdir=/var/lib/jenkins/tmp/ tmp.
+ TEMP_DIR=/var/lib/jenkins/tmp/tmp.4rp2LhEOsdROV7g7w2jGgVqH
+ temp_cleanup+=("${TEMP_DIR}")
+ mkdir -p -- /var/lib/jenkins/tmp/tmp.4rp2LhEOsdROV7g7w2jGgVqH/x2goclient
+ chmod 2770 -Rf -- /var/lib/jenkins/tmp/tmp.4rp2LhEOsdROV7g7w2jGgVqH
+ cd /var/lib/jenkins/build/heuler/x2goclient
+ git clone /var/lib/jenkins/build/heuler/x2goclient 
/var/lib/jenkins/tmp/tmp.4rp2LhEOsdROV7g7w2jGgVqH/x2goclient/
Cloning into '/var/lib/jenkins/tmp/tmp.4rp2LhEOsdROV7g7w2jGgVqH/x2goclient'...
done.
+ cd /var/lib/jenkins/tmp/tmp.4rp2LhEOsdROV7g7w2jGgVqH/x2goclient
+ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
+ find /var/lib/jenkins/build/heuler/x2goclient/../ -type f -maxdepth 0 
-mindepth 0
+ grep -qs 'x2goclient_*.orig.tar.gz'
++ gitrevno
+ GITREV=1214
+ SA_OPTION=
+ test -f debian/source/format
+ grep -Eqs '^3.0.*\(quilt\)$' debian/source/format
+ '[' -n 4 ']'
+ '[' 4 -gt 3 ']'
+ typeset -l codename=wheezy
+ '[' xwheezy = xsid ']'
+ typeset numerical_version=
+ typeset -i tmp_ret=1
+ typeset pretty_dist=
+ '[' -n debian ']'
+ '[' debian = debian ']'
+ pretty_dist=Debian
++ /home/_jenkins_/buildscripts/bin/debian-codename-to-version.sh wheezy
+ numerical_version=7
+ tmp_ret=0
+ '[' -n debian ']'
+ '[' debian = ubuntu ']'
+ '[' 0 -ne 0 ']'
+ '[' -z 7 ']'
+ '[' xheuler '!=' xmain ']'
+ mv -- debian/control debian/control.tmp
+ sed 's,Section:[\ ]*\(.*\),Section: heuler/\1,g' debian/control.tmp
+ '[' heuler '!=' heuler ']'
+ dch --distribution wheezy --force-distribution -l 
'~git20160827.1214+7.heuler.' 'Development-Snapshot!!! Auto-built Debian wheezy 
(7) package for packages.x2go.org repository (Git commit: 
742205ca52694490a5130f6f00ff14e079d6b353).'
dch warning: Recognised distributions are: unstable, testing, stable,
oldstable, experimental, {testing-,stable-,oldstable-,}proposed-updates,
{testing,stable,oldstable}-security, wheezy-backports, jessie-backports and 
UNRELEASED.
Using your request anyway.
+ mkdir -p -- /var/lib/jenkins/pkg-dist/heuler/x2goclient/debian/wheezy/amd64 
/var/lib/jenkins/pkg-dist/heuler/x2goclient/debian/wheezy/i386
+ OTHERMIRROR=
+ '[' xheuler = xheuler ']'
+ grep -qs x2goclient
+ OTHERMIRROR='deb http://packages.x2go.org/debian wheezy main heuler'
+ '[' x2goclient = x2gomatebindings ']'
+ git --no-pager log --since '2 years ago' '--format=%ai %aN (%h) 
%n%n%x09*%w(68,0,10) %s%d%n'
+ '[' xyes '!=' xyes ']'
+ '[' xyes = xyes ']'
+ '[' x = x ']'
+ '[' x '!=' xamd64 ']'
+ grep -Eqs 'Architecture.*(all|any|amd64)' debian/control
+ nice sudo GNUPGHOME=/var/lib/jenkins/.gnupg DIST=debian CODENAME=wheezy 
ARCH=amd64 'OTHERMIRROR=deb http://packages.x2go.org/debian wheezy main heuler' 
pdebuild --pbuilder qemubuilder --auto-debsign --debsign-k F4A7678C9C6B0B2B 
--buildresult /var/lib/jenkins/pkg-dist/heuler/x2goclient/debian/wheezy/amd64 
-- --allow-untrusted
 BASEDIRECTORY=/srv/pbuilder/cache
 DIST=debian
 CODENAME=wheezy
 ARCH=amd64
 COMPONENT=nightly
 BASETGZ=/srv/pbuilder/cache/base-debian-wheezy-amd64.tgz
 DISTRIBUTION=wheezy
 BUILDRESULT=/srv/pbuilder/cache/debian-wheezy-amd64/result/
 APTCACHE=/srv/pbuilder/cache/debian-wheezy-amd64/aptcache/
+ id -u
 BUILDRESULTUID=0
+ id -g
 BUILDRESULTGID=0
 CCACHEDIR=
 APTCACHEHARDLINK=yes
 USE_DEBUILD_INTERNAL=yes
 PRESERVE_BUILDPLACE=yes
 ARCHITECTURE=amd64
 UML_DISTRIBUTION=wheezy
 BASEPATH=/srv/pbuilder/cache/base-debian-wheezy-amd64.qemu
 '[' -e /srv/pbuilder/qemu-kernels/amd64/vmlinuz.wheezy ']'
 KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/amd64/vmlinuz
 INITRD=/srv/pbuilder/qemu-kernels/amd64/initrd.img
 ARCH_DISKDEVICE=sd
 '[' xamd64 = xarmel ']'
 SMP=2
 MEMORY_MEGS=512
 '[' xdebian = xubuntu ']'
 '[' xdebian = xdebian ']'
 '[' xwheezy = xlenny ']'
 MIRRORSITE=http://localhost:3142/debian
 EXTRA_ARCHS=armel
++ . /usr/lib/pbuilder/pbuilder-modules
+++ export LANG=C
+++ LANG=C
+++ export LC_ALL=C
+++ LC_ALL=C
++ PBUILDER_BUILD_LOGFILE=
++ '[' -n --pbuilder ']'
++ case "$1" in
++ log 'I: using qemubuilder as pbuilder'
++ 

[X2Go-Commits] [x2goclient] 213/217: src/unixhelper.{cpp, h}: split off core functionality of kill_pgroup () into a new function called real_kill_pgroup ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 4330afe5fc1782dd61ac86e1f14636887d2bdff5
Author: Mihai Moldovan 
Date:   Fri Aug 12 09:00:41 2016 +0200

src/unixhelper.{cpp,h}: split off core functionality of kill_pgroup () into 
a new function called real_kill_pgroup ().
---
 debian/changelog   |2 ++
 src/unixhelper.cpp |   37 +++--
 src/unixhelper.h   |   12 
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1edb449..ac2629b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -396,6 +396,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: fix PA version fetching on OS X again.
 - src/unixhelper.{cpp,h}: make argument of kill_pgroup () const.
 - src/unixhelper.h: style and general fixes within comments.
+- src/unixhelper.{cpp,h}: split off core functionality of kill_pgroup ()
+  into a new function called real_kill_pgroup ().
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index 4488786..4d9c56f 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -30,25 +30,42 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 /* For documentation please see unixhelper.h. */
 
 namespace unixhelper {
   void kill_pgroup (const int signal) {
-if (SIGHUP == signal) {
-  /* Try to kill via SIGTERM first. */
-  if (0 != killpg (getpgrp (), SIGTERM)) {
-std::cerr << "WARNING: unable to send SIGTERM to process group: " << 
std::strerror (errno) << std::endl;
-  }
+  }
+
+  void real_kill_pgroup (const pid_t pgid) {
+/* Try to kill via SIGTERM first. */
+if (0 != killpg (pgid, SIGTERM)) {
+  std::cerr << "WARNING: unable to send SIGTERM to process group '" << 
pgid << "': " << std::strerror (errno) << std::endl;
+}
+
+/* Grant a grace period of (at least) 10 seconds. */
+sleep (10);
 
-  /* Grant a grace period of (at least) 10 seconds. */
-  sleep (10);
+int kill_ret = killpg (pgid, SIGKILL);
 
-  /* Don't handle any errors here, because we die anyway. */
-  killpg (getpgrp (), SIGKILL);
+/*
+ * Might be unreachable.
+ * Depending upon which pgroup we just killed, this
+ * code is either unreachable (because killpg () killed
+ * itself already), or being executed.
+ * Let's handle errors and exit, if necessary.
+ */
+if (0 != kill_ret) {
+  char err_str[512] = { };
+  snprintf (err_str, 512, "WARNING: failed to kill process group '%d'", 
pgid);
+
+  perror (err_str);
 }
-  }
 
+exit (EXIT_SUCCESS);
+  }
 
   int unix_cleanup (const pid_t parent) {
 /*
diff --git a/src/unixhelper.h b/src/unixhelper.h
index d67f3ed..662b3be 100644
--- a/src/unixhelper.h
+++ b/src/unixhelper.h
@@ -63,6 +63,18 @@ namespace unixhelper {
* Other values are not handled.
*/
   void kill_pgroup (const int signal);
+
+  /*
+   * Kills the whole process group.
+   * First, SIGTERM is sent to the group.
+   * A 10 seconds grace period is granted to make sure
+   * processes exit cleanly on their own.
+   * Lastly, SIGKILL is sent to the group -- which also
+   * implies the demise of this program.
+   *
+   * pgid is the process group ID to be killed.
+   */
+  void real_kill_pgroup (const pid_t pgid);
 }
 
 #endif /* defined (Q_OS_UNIX) */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 216/217: src/unixhelper.cpp: code cleanup.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 844e7681de3f93f48516f69c5839a5fc7aeb9b50
Author: Mihai Moldovan 
Date:   Sat Aug 13 23:33:15 2016 +0200

src/unixhelper.cpp: code cleanup.
---
 debian/changelog   |1 +
 src/unixhelper.cpp |   14 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6dec3e..09aeb4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -403,6 +403,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   cleanup process doesn't kill itself before all other processes in the
   process group are killed.
 - src/pulsemanager.cpp: remove unused variables.
+- src/unixhelper.cpp: code cleanup.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index 82e4374..d6b4993 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 
 /* For documentation please see unixhelper.h. */
 
@@ -60,8 +59,8 @@ namespace unixhelper {
   }
   /* Error. */
   else if (-1 == tmp_pid) {
-perror ("WARNING: unable to fork off another process to kill original 
process group");
-std::cerr << "Proceeding with normal operation, but  process might 
kill itself before tree vanishes." << std::endl;
+std::perror ("WARNING: unable to fork off another process to kill 
original process group");
+std::cerr << "Proceeding with normal operation, but process might kill 
itself before tree vanishes." << std::endl;
 
 real_kill_pgroup (pgid_to_kill);
   }
@@ -72,7 +71,7 @@ namespace unixhelper {
  * spawn a bunch of new processes due to subsequent calls
  * to kill_pgroup () from unix_cleanup ().
  */
-exit (EXIT_SUCCESS);
+std::exit (EXIT_SUCCESS);
   }
 }
   }
@@ -96,13 +95,10 @@ namespace unixhelper {
  * Let's handle errors and exit, if necessary.
  */
 if (0 != kill_ret) {
-  char err_str[512] = { };
-  snprintf (err_str, 512, "WARNING: failed to kill process group '%d'", 
pgid);
-
-  perror (err_str);
+  std::cerr << "WARNING: failed to kill process group '" << pgid << "': " 
<< std::strerror (err_str) << std::endl;
 }
 
-exit (EXIT_SUCCESS);
+std::exit (EXIT_SUCCESS);
   }
 
   int unix_cleanup (const pid_t parent) {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] Build failed in Jenkins: x2goclient+nightly+debian-jessie #403

[jenkins]

See 


Changes:

[ionic] src/onmainwindow.cpp: work around changed SSH host key locations in OS X

--
[...truncated 266 lines...]
+++ ret=XX
+++ i=18
+++ '[' 18 -lt 24 ']'
 printf X
+++ ret=XXX
+++ i=19
+++ '[' 19 -lt 24 ']'
 printf X
+++ ret=
+++ i=20
+++ '[' 20 -lt 24 ']'
 printf X
+++ ret=X
+++ i=21
+++ '[' 21 -lt 24 ']'
 printf X
+++ ret=XX
+++ i=22
+++ '[' 22 -lt 24 ']'
 printf X
+++ ret=XXX
+++ i=23
+++ '[' 23 -lt 24 ']'
 printf X
+++ ret=
+++ i=24
+++ '[' 24 -lt 24 ']'
+++ printf 
+++ return 0
++ mktemp -d --tmpdir=/var/lib/jenkins/tmp/ tmp.
+ TEMP_DIR=/var/lib/jenkins/tmp/tmp.rxa11PWqB8HGMVAxKliIeB4n
+ temp_cleanup+=("${TEMP_DIR}")
+ mkdir -p -- /var/lib/jenkins/tmp/tmp.rxa11PWqB8HGMVAxKliIeB4n/x2goclient
+ chmod 2770 -Rf -- /var/lib/jenkins/tmp/tmp.rxa11PWqB8HGMVAxKliIeB4n
+ cd /var/lib/jenkins/build/heuler/x2goclient
+ git clone /var/lib/jenkins/build/heuler/x2goclient 
/var/lib/jenkins/tmp/tmp.rxa11PWqB8HGMVAxKliIeB4n/x2goclient/
Cloning into '/var/lib/jenkins/tmp/tmp.rxa11PWqB8HGMVAxKliIeB4n/x2goclient'...
done.
+ cd /var/lib/jenkins/tmp/tmp.rxa11PWqB8HGMVAxKliIeB4n/x2goclient
+ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
+ find /var/lib/jenkins/build/heuler/x2goclient/../ -type f -maxdepth 0 
-mindepth 0
+ grep -qs 'x2goclient_*.orig.tar.gz'
++ gitrevno
+ GITREV=1214
+ SA_OPTION=
+ test -f debian/source/format
+ grep -Eqs '^3.0.*\(quilt\)$' debian/source/format
+ '[' -n 4 ']'
+ '[' 4 -gt 3 ']'
+ typeset -l codename=jessie
+ '[' xjessie = xsid ']'
+ typeset numerical_version=
+ typeset -i tmp_ret=1
+ typeset pretty_dist=
+ '[' -n debian ']'
+ '[' debian = debian ']'
+ pretty_dist=Debian
++ /home/_jenkins_/buildscripts/bin/debian-codename-to-version.sh jessie
+ numerical_version=8
+ tmp_ret=0
+ '[' -n debian ']'
+ '[' debian = ubuntu ']'
+ '[' 0 -ne 0 ']'
+ '[' -z 8 ']'
+ '[' xheuler '!=' xmain ']'
+ mv -- debian/control debian/control.tmp
+ sed 's,Section:[\ ]*\(.*\),Section: heuler/\1,g' debian/control.tmp
+ '[' heuler '!=' heuler ']'
+ dch --distribution jessie --force-distribution -l 
'~git20160827.1214+8.heuler.' 'Development-Snapshot!!! Auto-built Debian jessie 
(8) package for packages.x2go.org repository (Git commit: 
742205ca52694490a5130f6f00ff14e079d6b353).'
dch warning: Recognised distributions are: unstable, testing, stable,
oldstable, experimental, {testing-,stable-,oldstable-,}proposed-updates,
{testing,stable,oldstable}-security, wheezy-backports, jessie-backports and 
UNRELEASED.
Using your request anyway.
+ mkdir -p -- /var/lib/jenkins/pkg-dist/heuler/x2goclient/debian/jessie/amd64 
/var/lib/jenkins/pkg-dist/heuler/x2goclient/debian/jessie/i386
+ OTHERMIRROR=
+ '[' xheuler = xheuler ']'
+ grep -qs x2goclient
+ OTHERMIRROR='deb http://packages.x2go.org/debian jessie main heuler'
+ '[' x2goclient = x2gomatebindings ']'
+ git --no-pager log --since '2 years ago' '--format=%ai %aN (%h) 
%n%n%x09*%w(68,0,10) %s%d%n'
+ '[' xyes '!=' xyes ']'
+ '[' xyes = xyes ']'
+ '[' x = x ']'
+ '[' x '!=' xamd64 ']'
+ grep -Eqs 'Architecture.*(all|any|amd64)' debian/control
+ nice sudo GNUPGHOME=/var/lib/jenkins/.gnupg DIST=debian CODENAME=jessie 
ARCH=amd64 'OTHERMIRROR=deb http://packages.x2go.org/debian jessie main heuler' 
pdebuild --pbuilder qemubuilder --auto-debsign --debsign-k F4A7678C9C6B0B2B 
--buildresult /var/lib/jenkins/pkg-dist/heuler/x2goclient/debian/jessie/amd64 
-- --allow-untrusted
 BASEDIRECTORY=/srv/pbuilder/cache
 DIST=debian
 CODENAME=jessie
 ARCH=amd64
 COMPONENT=nightly
 BASETGZ=/srv/pbuilder/cache/base-debian-jessie-amd64.tgz
 DISTRIBUTION=jessie
 BUILDRESULT=/srv/pbuilder/cache/debian-jessie-amd64/result/
 APTCACHE=/srv/pbuilder/cache/debian-jessie-amd64/aptcache/
+ id -u
 BUILDRESULTUID=0
+ id -g
 BUILDRESULTGID=0
 CCACHEDIR=
 APTCACHEHARDLINK=yes
 USE_DEBUILD_INTERNAL=yes
 PRESERVE_BUILDPLACE=yes
 ARCHITECTURE=amd64
 UML_DISTRIBUTION=jessie
 BASEPATH=/srv/pbuilder/cache/base-debian-jessie-amd64.qemu
 '[' -e /srv/pbuilder/qemu-kernels/amd64/vmlinuz.jessie ']'
 KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/amd64/vmlinuz
 INITRD=/srv/pbuilder/qemu-kernels/amd64/initrd.img
 ARCH_DISKDEVICE=sd
 '[' xamd64 = xarmel ']'
 SMP=2
 MEMORY_MEGS=512
 '[' xdebian = xubuntu ']'
 '[' xdebian = xdebian ']'
 '[' xjessie = xlenny ']'
 MIRRORSITE=http://localhost:3142/debian
 EXTRA_ARCHS=armel
++ . /usr/lib/pbuilder/pbuilder-modules
+++ export LANG=C
+++ LANG=C
+++ export LC_ALL=C
+++ LC_ALL=C
++ PBUILDER_BUILD_LOGFILE=
++ '[' -n --pbuilder ']'
++ case "$1" in
++ log 'I: using qemubuilder as pbuilder'
++ 

[X2Go-Commits] [x2goclient] 214/217: src/unixhelper.{cpp, h}: rewrite kill_pgroup () to act as a wrapper around real_kill_pgroup ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 15dc76480ff1f1ddb9f00c6e0a206d0bb4764a12
Author: Mihai Moldovan 
Date:   Fri Aug 12 09:11:16 2016 +0200

src/unixhelper.{cpp,h}: rewrite kill_pgroup () to act as a wrapper around 
real_kill_pgroup ().

Adjust comment.

We need to do this so the cleanup process doesn't kill itself before all
other processes in the process group are killed.
---
 debian/changelog   |4 
 src/unixhelper.cpp |   38 ++
 src/unixhelper.h   |   12 ++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac2629b..f1ca32b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -398,6 +398,10 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/unixhelper.h: style and general fixes within comments.
 - src/unixhelper.{cpp,h}: split off core functionality of kill_pgroup ()
   into a new function called real_kill_pgroup ().
+- src/unixhelper.{cpp,h}: rewrite kill_pgroup () to act as a wrapper
+  around real_kill_pgroup (). Adjust comment. We need to do this so the
+  cleanup process doesn't kill itself before all other processes in the
+  process group are killed.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index 4d9c56f..82e4374 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -37,6 +37,44 @@
 
 namespace unixhelper {
   void kill_pgroup (const int signal) {
+pid_t pgid_to_kill = getpgrp ();
+
+if ((SIGHUP == signal) || (-1 == signal)) {
+  /*
+   * In order to not kill ourselves, we need to run this
+   * code in a new process group.
+   */
+  pid_t tmp_pid = fork ();
+
+  /* Child. */
+  if (0 == tmp_pid) {
+/* Create new pgid. */
+int err = setpgid (0, 0);
+
+if (0 != err) {
+  std::perror ("WARNING: unable to change PGID");
+  std::cerr << "Continuing with normal operation, but process might 
kill itself before tree vanishes." << std::endl;
+}
+
+real_kill_pgroup (pgid_to_kill);
+  }
+  /* Error. */
+  else if (-1 == tmp_pid) {
+perror ("WARNING: unable to fork off another process to kill original 
process group");
+std::cerr << "Proceeding with normal operation, but  process might 
kill itself before tree vanishes." << std::endl;
+
+real_kill_pgroup (pgid_to_kill);
+  }
+  /* Parent. */
+  else {
+/*
+ * No need to do anything, just exit here in order to not
+ * spawn a bunch of new processes due to subsequent calls
+ * to kill_pgroup () from unix_cleanup ().
+ */
+exit (EXIT_SUCCESS);
+  }
+}
   }
 
   void real_kill_pgroup (const pid_t pgid) {
diff --git a/src/unixhelper.h b/src/unixhelper.h
index 662b3be..7d30bcf 100644
--- a/src/unixhelper.h
+++ b/src/unixhelper.h
@@ -47,12 +47,12 @@ namespace unixhelper {
   int unix_cleanup (const pid_t parent);
 
   /*
-   * Kills the whole process group.
-   * First, SIGTERM is sent to the group.
-   * A 10 seconds grace period is granted to make sure
-   * processes exit cleanly on their own.
-   * Lastly, SIGKILL is sent to the group -- which also
-   * implies the demise of this program.
+   * Wrapper for killing a whole process group.
+   * The "real" killing work is done by real_kill_pgroup ().
+   * This function tries to fork off another process and change
+   * the new function's process group ID.
+   * If any of these operations fail, killing the original process
+   * group ID will still continue, albeit with warning messages.
*
* signal may be any of:
*   * -1   to indicate an error leading to emergency termination

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 212/217: src/unixhelper.h: style and general fixes within comments.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 03ed57d1206c414104b2fd6da13641234a4cd3db
Author: Mihai Moldovan 
Date:   Fri Aug 12 09:06:32 2016 +0200

src/unixhelper.h: style and general fixes within comments.
---
 debian/changelog |1 +
 src/unixhelper.h |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a98b7f..1edb449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -395,6 +395,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   startup issue on Windows.
 - src/pulsemanager.cpp: fix PA version fetching on OS X again.
 - src/unixhelper.{cpp,h}: make argument of kill_pgroup () const.
+- src/unixhelper.h: style and general fixes within comments.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.h b/src/unixhelper.h
index 3c2798f..d67f3ed 100644
--- a/src/unixhelper.h
+++ b/src/unixhelper.h
@@ -29,7 +29,7 @@
 namespace unixhelper {
   /*
* Unblocks all signals and installs a signal handler for SIGHUP,
-   * which calls kill_pgroup().
+   * which calls kill_pgroup ().
*
* Should signal unblocking or installing the signal handler fail,
* an emergency exit is performed and
@@ -42,7 +42,7 @@ namespace unixhelper {
*
* In this loop, the current parent PID is polled and compared against
* the original value passed via parameter parent.
-   * Should they mismatch, the parent died and kill_pgroup() is called.
+   * Should they mismatch, the parent died and kill_pgroup () is called.
*/
   int unix_cleanup (const pid_t parent);
 
@@ -60,6 +60,7 @@ namespace unixhelper {
*  group leader dies under specific circumstances
*  (we cannot rely that this always happens, though,
*   so a polling solution is needed, see unix_cleanup().)
+   * Other values are not handled.
*/
   void kill_pgroup (const int signal);
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 215/217: src/pulsemanager.cpp: remove unused variables.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 17e70ba597b3dbb8cb0204d6ba0348f9049e42a4
Author: Mihai Moldovan 
Date:   Sat Aug 13 23:27:42 2016 +0200

src/pulsemanager.cpp: remove unused variables.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1ca32b..b6dec3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -402,6 +402,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   around real_kill_pgroup (). Adjust comment. We need to do this so the
   cleanup process doesn't kill itself before all other processes in the
   process group are killed.
+- src/pulsemanager.cpp: remove unused variables.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 01677dd..93c83b3 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -468,8 +468,6 @@ void PulseManager::fetch_pulseaudio_version () {
   }
 }
 
-bool numbers_done[3] = { false, false, false };
-
 if (numbers_skip[0]) {
   x2goErrorf (30) << "Supposed to skip major version number. Something 
is wrong.";
   show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version 
number!"),

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 217/217: src/{unixhelper.cpp, x2goclient.cpp}: fix errno usage - save before use.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 39dae217c6b28c4b894dec5179bda5fa4c020768
Author: Mihai Moldovan 
Date:   Sat Aug 13 23:42:53 2016 +0200

src/{unixhelper.cpp,x2goclient.cpp}: fix errno usage - save before use.
---
 debian/changelog   |1 +
 src/unixhelper.cpp |   18 --
 src/x2goclient.cpp |9 ++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09aeb4f..11c7ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -404,6 +404,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   process group are killed.
 - src/pulsemanager.cpp: remove unused variables.
 - src/unixhelper.cpp: code cleanup.
+- src/{unixhelper.cpp,x2goclient.cpp}: fix errno usage - save before use.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index d6b4993..406cdda 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -79,7 +79,8 @@ namespace unixhelper {
   void real_kill_pgroup (const pid_t pgid) {
 /* Try to kill via SIGTERM first. */
 if (0 != killpg (pgid, SIGTERM)) {
-  std::cerr << "WARNING: unable to send SIGTERM to process group '" << 
pgid << "': " << std::strerror (errno) << std::endl;
+  const int saved_errno = errno;
+  std::cerr << "WARNING: unable to send SIGTERM to process group '" << 
pgid << "': " << std::strerror (saved_errno) << std::endl;
 }
 
 /* Grant a grace period of (at least) 10 seconds. */
@@ -95,7 +96,8 @@ namespace unixhelper {
  * Let's handle errors and exit, if necessary.
  */
 if (0 != kill_ret) {
-  std::cerr << "WARNING: failed to kill process group '" << pgid << "': " 
<< std::strerror (err_str) << std::endl;
+  const int saved_errno = errno;
+  std::cerr << "WARNING: failed to kill process group '" << pgid << "': " 
<< std::strerror (saved_errno) << std::endl;
 }
 
 std::exit (EXIT_SUCCESS);
@@ -108,14 +110,16 @@ namespace unixhelper {
  */
 sigset_t empty_set;
 if (0 != sigemptyset (_set)) {
-  std::cerr << "Unable to fetch empty signal set: " << std::strerror 
(errno) << std::endl;
+  const int saved_errno = errno;
+  std::cerr << "Unable to fetch empty signal set: " << std::strerror 
(saved_errno) << std::endl;
   kill_pgroup (-1);
 
   /* Anything here shall be unreachable. */
 }
 
 if (0 != sigprocmask (SIG_SETMASK, _set, NULL)) {
-  std::cerr << "Unable to set empty signal set: " << std::strerror (errno) 
<< std::endl;
+  const int saved_errno = errno;
+  std::cerr << "Unable to set empty signal set: " << std::strerror 
(saved_errno) << std::endl;
   kill_pgroup (-1);
 
   /* Anything here shall be unreachable. */
@@ -137,7 +141,8 @@ namespace unixhelper {
 
   /* Set up signal handler to ignore the current signal. */
   if (0 != sigaction (*it, _action, NULL)) {
-std::cerr << "Unable to ignore signal " << strsignal (*it) << ": " << 
std::strerror (errno) << std::endl;
+const int saved_errno = errno;
+std::cerr << "Unable to ignore signal " << strsignal (*it) << ": " << 
std::strerror (saved_errno) << std::endl;
 kill_pgroup (-1);
 
 /* Anything here shall be unreachable. */
@@ -151,7 +156,8 @@ namespace unixhelper {
   sig_action.sa_flags = SA_RESTART;
 
   if (0 != sigaction (SIGHUP, _action, NULL)) {
-std::cerr << "Unable to set up signal handler for SIGHUP: " << 
std::strerror (errno) << std::endl;
+const int saved_errno = errno;
+std::cerr << "Unable to set up signal handler for SIGHUP: " << 
std::strerror (saved_errno) << std::endl;
 kill_pgroup (-1);
 
 /* Anything here shall be unreachable. */
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index b201a4e..431a01e 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -58,13 +58,15 @@ int fork_helper (int argc, char **argv) {
 new_argv_c_str->push_back (0);
 
 if (0 != execv (new_argv_c_str->front (), &(new_argv_c_str->front ( {
-  std::cerr << "Failed to re-execute process as UNIX cleanup helper tool: 
" << std::strerror (errno) << "\n"
+  const int saved_errno = errno;
+  std::cerr << "Failed to re-execute process as UNIX cleanup helper tool: 
" << std::strerror (saved_errno) << "\n"
 << "Terminating and killing parent." << "\n"
 << "Please report a bug, refer to this documentation: 
http://wiki.x2go.org/doku.php/wiki:bugs; << std::endl;
 
   pid_t parent_pid = getppid ();
   if (0 != kill (parent_pid, SIGTERM)) {
-std::cerr << "Failed to kill parent process: " << std::strerror 
(errno) << std::endl;
+const int 

[X2Go-Commits] [x2goclient] 205/217: src/onmainwindow.cpp: fix compile error on Windows after moving some code around.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 0715c0fbe0ce9eb7e4ae8ca54614e32a4c3cafeb
Author: Mihai Moldovan 
Date:   Mon Jul 4 23:03:57 2016 +0200

src/onmainwindow.cpp: fix compile error on Windows after moving some code 
around.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 920d038..baf3ed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -377,6 +377,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   initialization in Windows-only code.
 - src/onmainwindow.cpp: add another pair of braces to in_addr-type
   variable initialization on Windows to silence compiler warning.
+- src/onmainwindow.cpp: fix compile error on Windows after moving some
+  code around.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 5976ddc..70b517a 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10239,7 +10239,7 @@ void ONMainWindow::generateEtcFiles()
  "AuthorizedKeysFile \"" << authKeyPath << "\"\n" <<
 #ifdef Q_OS_WIN
  "Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<<
- "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<<
+ "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n";
 #else
  "Subsystem sftp "
 /* This may need some sanitization, i.e., appDir could potentially include 
whitespace. */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 202/217: src/onmainwindow.cpp: drop obsolete pulseVersionTest variable initialization in Windows-only code.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 326b4b3cfb87ca9f91e47cb75da4b3db8fc033a7
Author: Mihai Moldovan 
Date:   Mon Jul 4 05:34:34 2016 +0200

src/onmainwindow.cpp: drop obsolete pulseVersionTest variable 
initialization in Windows-only code.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c7cc3ef..535094a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -371,6 +371,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   the userSshd variable. We don't need it on Windows (and don't define it
   on purpose) because using an user-mode SSH daemon is implied there (for
   now.)
+- src/onmainwindow.cpp: drop obsolete pulseVersionTest variable
+  initialization in Windows-only code.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 569679b..1f34331 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -170,7 +170,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow 
( parent )
 homeDir=QDir::homePath();
 
 #ifdef Q_OS_WIN
-pulseVersionTest=0l;
 xorg=0l;
 xDisplay=0;
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 208/217: src/pulsemanager.cpp: make PA version parsing function more generic and don't expect that a number is always terminated with a period or dash.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit e28e785eb3323c5d1b763e946ef5941935b8d30f
Author: Mihai Moldovan 
Date:   Mon Jul 11 05:22:09 2016 +0200

src/pulsemanager.cpp: make PA version parsing function more generic and 
don't expect that a number is always terminated with a period or dash.

Especially on Windows, with a PA version number of "6.0", this lead to
errors. OS X was fine with its "8.0.0-something" version number, but the
optional part at the end or even the micro version number could be
missing any time.
---
 debian/changelog |6 ++
 src/pulsemanager.cpp |  165 ++
 2 files changed, 105 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57a8620..b9e65ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -383,6 +383,12 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   initializing in_addr-type variable, the C-style universal zero
   initializer won't cut it here.
 - src/pulsemanager.h: include accidentally omitted wapi.h header file.
+- src/pulsemanager.cpp: make PA version parsing function more generic and
+  don't expect that a number is always terminated with a period or dash.
+  Especially on Windows, with a PA version number of "6.0", this lead to
+  errors. OS X was fine with its "8.0.0-something" version number, but the
+  optional part at the end or even the micro version number could be
+  missing any time.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1fff171..1da7ea4 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -383,28 +383,32 @@ void PulseManager::fetch_pulseaudio_version () {
 tmp_str = tmp_str.mid (needle.size ());
 
 /* We should be at a digit now. */
-bool numbers_found[3] = { false, false, false };
-QString tmp_ret_str = QString ("");
+bool numbers_started[3] = { false, false, false };
+bool numbers_finished[3] = { false, false, false };
+bool numbers_skip[3] = { false, false, false };
+QString tmp_remaining_str = QString ("");
+QString numbers[3] = { };
 for (QString::const_iterator cit = tmp_str.begin (); cit != 
tmp_str.end (); ++cit) {
-  if (!(numbers_found[0])) {
+  if (!(numbers_finished[0])) {
 if (((*cit) >= '0') && ((*cit) <= '9')) {
-  tmp_ret_str.append (*cit);
+  numbers[0].append (*cit);
+  numbers_started[0] = true;
 }
 else if ((*cit) == '.') {
-  /* First number part complete, let's convert the string and skip 
the period. */
-  numbers_found[0] = true;
-  bool convert_success = false;
-  pulse_version_major_ = tmp_ret_str.toUInt (_success, 10);
-
-  if (!convert_success) {
-x2goErrorf (20) << "Unable to convert major version number 
string to integer.";
-show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio 
version number!"),
-   tr ("Unable to convert major 
version number string to integer."),
-   true);
-abort ();
-  }
-
-  tmp_ret_str = QString ("");
+  /* First number part complete and more to come, mark as done. */
+  numbers_finished[0] = true;
+}
+else if ((*cit) == '-') {
+  /* First number part complete and no more numbers, mark as done, 
and... */
+  numbers_finished[0] = true;
+
+  /*
+   * Skip all the other numbers (i.e., assume the default value.)
+   * This doesn't make a huge lot of sense for the first number,
+   * but let's make this robust...
+   */
+  numbers_skip[1] = true;
+  numbers_skip[2] = true;
 }
 else {
   x2goErrorf (21) << "Unexpected character found when parsing 
version string for major version number: '" << QString (*cit) << "'.";
@@ -415,36 +419,21 @@ void PulseManager::fetch_pulseaudio_version () {
   abort ();
 }
   }
-  else if (!(numbers_found[1])) {
+  else if (!(numbers_finished[1])) {
 if (((*cit) >= '0') && ((*cit) <= '9')) {
-  tmp_ret_str.append (*cit);
+  numbers[1].append (*cit);
+  numbers_started[1] = true;
 }
-else if (((*cit) == '.') || ((*cit) == '-')) {
-  /*
-   * Second number part complete, let's convert the string 

[X2Go-Commits] [x2goclient] 207/217: src/pulsemanager.h: include accidentally omitted wapi.h header file.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit d18c800e928e1009a74925f10dda9db92a29bec6
Author: Mihai Moldovan 
Date:   Mon Jul 4 23:19:13 2016 +0200

src/pulsemanager.h: include accidentally omitted wapi.h header file.
---
 debian/changelog   |1 +
 src/pulsemanager.h |1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a15a47c..57a8620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -382,6 +382,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/onmainwindow.cpp: use correct C++ universal initializer for
   initializing in_addr-type variable, the C-style universal zero
   initializer won't cut it here.
+- src/pulsemanager.h: include accidentally omitted wapi.h header file.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index ff541cb..0b1ae3c 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -38,6 +38,7 @@
 #endif /* defined (Q_OS_WIN) */
 
 #include "x2gosettings.h"
+#include "wapi.h"
 
 class PulseManager: public QObject {
   Q_OBJECT;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 206/217: src/onmainwindow.cpp: use correct C++ universal initializer for initializing in_addr-type variable, the C-style universal zero initializer won't cut it here.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit de931a150056bac2923670b8d162cd7a31de0c83
Author: Mihai Moldovan 
Date:   Mon Jul 4 23:16:59 2016 +0200

src/onmainwindow.cpp: use correct C++ universal initializer for 
initializing in_addr-type variable, the C-style universal zero initializer 
won't cut it here.
---
 debian/changelog |3 +++
 src/onmainwindow.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index baf3ed1..a15a47c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -379,6 +379,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   variable initialization on Windows to silence compiler warning.
 - src/onmainwindow.cpp: fix compile error on Windows after moving some
   code around.
+- src/onmainwindow.cpp: use correct C++ universal initializer for
+  initializing in_addr-type variable, the C-style universal zero
+  initializer won't cut it here.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 70b517a..7345d8d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9802,7 +9802,7 @@ bool ONMainWindow::isServerRunning ( int port )
 int iResult;
 WSADATA wsaData;
 
-struct in_addr addr = {{ 0 }};
+struct in_addr addr = {{ }};
 
 iResult = WSAStartup(MAKEWORD(2, 2), );
 if (iResult != 0)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 209/217: src/pulsemanager.cpp: make sure that wherever we interface with non-Qt functions, paths are in native form (i.e., containing empty separators, instead of the "gene

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5f7145d639e9f83afc512a4c92954e63d4857b8e
Author: Mihai Moldovan 
Date:   Mon Jul 11 05:34:22 2016 +0200

src/pulsemanager.cpp: make sure that wherever we interface with non-Qt 
functions, paths are in native form (i.e., containing empty separators, instead 
of the "generic" slash UNIX-style separator.)

Should fix a PA startup issue on Windows.
---
 debian/changelog |4 
 src/pulsemanager.cpp |   24 
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9e65ad..ec67bce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -389,6 +389,10 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   errors. OS X was fine with its "8.0.0-something" version number, but the
   optional part at the end or even the micro version number could be
   missing any time.
+- src/pulsemanager.cpp: make sure that wherever we interface with non-Qt
+  functions, paths are in native form (i.e., containing empty separators,
+  instead of the "generic" slash UNIX-style separator.) Should fix a PA
+  startup issue on Windows.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1da7ea4..6170634 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -51,10 +51,10 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
   pulse_dir_.cd (pulse_X2Go_.mid (1));
 
   env_ = QProcessEnvironment::systemEnvironment ();
-  env_.insert ("HOME", pulse_dir_.absolutePath ());
-  env_.insert ("TEMP", pulse_dir_.absolutePath () + "/tmp");
+  env_.insert ("HOME", QDir::toNativeSeparators (pulse_dir_.absolutePath ()));
+  env_.insert ("TEMP", QDir::toNativeSeparators (pulse_dir_.absolutePath () + 
"/tmp"));
 #ifdef Q_OS_WIN
-  env_.insert ("USERPROFILE", pulse_dir_.absolutePath ());
+  env_.insert ("USERPROFILE", QDir::toNativeSeparators 
(pulse_dir_.absolutePath ()));
   env_.insert ("USERNAME", "pulseuser");
 #endif // defined (Q_OS_WIN)
 
@@ -277,16 +277,16 @@ void PulseManager::start_generic () {
 void PulseManager::start_osx () {
   server_args_ = QStringList ();
   server_args_ << "--exit-idle-time=-1" << "-n"
-   << "-F" << pulse_dir_.absolutePath () + "/config.pa";
+   << "-F" << QDir::toNativeSeparators (pulse_dir_.absolutePath () 
+ "/config.pa");
 
   if (!system_pulse_) {
 server_args_ << "-p"
- << QDir (app_dir_
-  + "/../Frameworks/pulse-"
-  + QString::number (pulse_version_major_)
-  + "."
-  + QString::number (pulse_version_minor_)
-  + "/modules").absolutePath ();
+ << QDir::toNativeSeparators (QDir (app_dir_
++ "/../Frameworks/pulse-"
++ QString::number 
(pulse_version_major_)
++ "."
++ QString::number 
(pulse_version_minor_)
++ "/modules").absolutePath 
());
   }
 
   server_args_ << "--high-priority";
@@ -294,7 +294,7 @@ void PulseManager::start_osx () {
   if (debug_) {
 server_args_ << "--log-level=debug"
  << "--verbose"
- << "--log-target=file:" + pulse_dir_.absolutePath () + 
"/pulse.log";
+ << "--log-target=file:" + QDir::toNativeSeparators 
(pulse_dir_.absolutePath () + "/pulse.log");
   }
 
   if (generate_server_config () && generate_client_config ()) {
@@ -322,7 +322,7 @@ void PulseManager::start_win () {
   if (debug_) {
 server_args_ << "--log-level=debug"
  << "--verbose"
- << "--log-target=file:" + pulse_dir_.absolutePath () + 
"\\pulse.log";
+ << "--log-target=file:" + QDir::toNativeSeparators 
(pulse_dir_.absolutePath () + "/pulse.log");
   }
 
   /*

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 211/217: src/unixhelper.{cpp, h}: make argument of kill_pgroup () const.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ca4ddfc6cedcec4bdc02216d6d7931dd5cc14ec1
Author: Mihai Moldovan 
Date:   Fri Aug 12 09:04:42 2016 +0200

src/unixhelper.{cpp,h}: make argument of kill_pgroup () const.
---
 debian/changelog   |1 +
 src/unixhelper.cpp |2 +-
 src/unixhelper.h   |2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 351cabc..1a98b7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -394,6 +394,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   instead of the "generic" slash UNIX-style separator.) Should fix a PA
   startup issue on Windows.
 - src/pulsemanager.cpp: fix PA version fetching on OS X again.
+- src/unixhelper.{cpp,h}: make argument of kill_pgroup () const.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.cpp b/src/unixhelper.cpp
index d5aa67d..4488786 100644
--- a/src/unixhelper.cpp
+++ b/src/unixhelper.cpp
@@ -34,7 +34,7 @@
 /* For documentation please see unixhelper.h. */
 
 namespace unixhelper {
-  void kill_pgroup (int signal) {
+  void kill_pgroup (const int signal) {
 if (SIGHUP == signal) {
   /* Try to kill via SIGTERM first. */
   if (0 != killpg (getpgrp (), SIGTERM)) {
diff --git a/src/unixhelper.h b/src/unixhelper.h
index a34456e..3c2798f 100644
--- a/src/unixhelper.h
+++ b/src/unixhelper.h
@@ -61,7 +61,7 @@ namespace unixhelper {
*  (we cannot rely that this always happens, though,
*   so a polling solution is needed, see unix_cleanup().)
*/
-  void kill_pgroup (int signal);
+  void kill_pgroup (const int signal);
 }
 
 #endif /* defined (Q_OS_UNIX) */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 204/217: src/onmainwindow.cpp: add another pair of braces to in_addr-type variable initialization on Windows to silence compiler warning.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 8c1f3d30f50bd97f98be3f09bae4dd38358313ff
Author: Mihai Moldovan 
Date:   Mon Jul 4 05:40:33 2016 +0200

src/onmainwindow.cpp: add another pair of braces to in_addr-type variable 
initialization on Windows to silence compiler warning.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a33f783..920d038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -375,6 +375,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   initialization in Windows-only code.
 - src/onmainwindow.cpp: drop obsolete pulseVersionIsLegacy variable
   initialization in Windows-only code.
+- src/onmainwindow.cpp: add another pair of braces to in_addr-type
+  variable initialization on Windows to silence compiler warning.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index c9a3b09..5976ddc 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9802,7 +9802,7 @@ bool ONMainWindow::isServerRunning ( int port )
 int iResult;
 WSADATA wsaData;
 
-struct in_addr addr = { 0 };
+struct in_addr addr = {{ 0 }};
 
 iResult = WSAStartup(MAKEWORD(2, 2), );
 if (iResult != 0)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 198/217: nsis/x2goclient.nsi: add startup.wav to installer package.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ee59ede1084eadf24195e93e3fdab961f638a1cf
Author: Mihai Moldovan 
Date:   Thu Jun 30 23:56:08 2016 +0200

nsis/x2goclient.nsi: add startup.wav to installer package.
---
 debian/changelog|1 +
 nsis/x2goclient.nsi |1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 206587b..4f4b5d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -361,6 +361,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the
   given path to CWD iff it's actually empty. Not the other way around.
 - src/x2goutils.cpp: add some debug logging to find_binary ().
+- nsis/x2goclient.nsi: add startup.wav to installer package.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi
index f2f8d77..417d264 100644
--- a/nsis/x2goclient.nsi
+++ b/nsis/x2goclient.nsi
@@ -128,6 +128,7 @@ Section "X2Go Client (required)" base
   File /a /x x2goclient.debug.exe /x pageant.exe /x puttygen.exe 
"x2goclient\*.*"
   File /r "x2goclient\pulse"
   File /r /x "fonts" "x2goclient\VcXsrv"
+  File "..\res\audio\startup.wav"
 
   ;Store installation folder
   WriteRegStr HKLM "Software\x2goclient" "" $INSTDIR

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 200/217: src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint otherwise.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 283b6495b75457b1568001fe415ab44379711536
Author: Mihai Moldovan 
Date:   Mon Jul 4 05:06:28 2016 +0200

src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint 
otherwise.
---
 debian/changelog   |2 ++
 src/pulsemanager.h |5 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b356a0d..9579286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -365,6 +365,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/: new file windows_stdint.h for Windows-compatibility when using
   std::(u)int*_t types. These are only available with GCC in C++11 mode on
   Windows for some reason.
+- src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint
+  otherwise.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 6e39b9a..ff541cb 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -30,7 +30,12 @@
 #include 
 #include 
 #include 
+
+#ifdef Q_OS_WIN
+#include "windows_stdint.h"
+#else /* defined (Q_OS_WIN) */
 #include 
+#endif /* defined (Q_OS_WIN) */
 
 #include "x2gosettings.h"
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 203/217: src/onmainwindow.cpp: drop obsolete pulseVersionIsLegacy variable initialization in Windows-only code.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 45fa5aefaef9a37f14ed4bae8dc18e6bdb3edb30
Author: Mihai Moldovan 
Date:   Mon Jul 4 05:35:11 2016 +0200

src/onmainwindow.cpp: drop obsolete pulseVersionIsLegacy variable  
initialization in Windows-only code.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 535094a..a33f783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -373,6 +373,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   now.)
 - src/onmainwindow.cpp: drop obsolete pulseVersionTest variable
   initialization in Windows-only code.
+- src/onmainwindow.cpp: drop obsolete pulseVersionIsLegacy variable
+  initialization in Windows-only code.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 1f34331..c9a3b09 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -435,7 +435,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow 
( parent )
 #ifdef Q_OS_WIN
 winServersReady=false;
 saveCygnusSettings();
-pulseVersionIsLegacy=false;
 #endif
 initPassDlg();
 initSelectSessDlg();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 201/217: src/onmainwindow.cpp: short out code parts unconditionally checking for the userSshd variable.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 06ae105293c32150bf5a448ffaf3166a87c04237
Author: Mihai Moldovan 
Date:   Mon Jul 4 05:24:49 2016 +0200

src/onmainwindow.cpp: short out code parts unconditionally checking for the 
userSshd variable.

We don't need it on Windows (and don't define it on purpose) because
using an user-mode SSH daemon is implied there (for now.)
---
 debian/changelog |4 
 src/onmainwindow.cpp |   19 ---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9579286..c7cc3ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -367,6 +367,10 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   Windows for some reason.
 - src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint
   otherwise.
+- src/onmainwindow.cpp: short out code parts unconditionally checking for
+  the userSshd variable. We don't need it on Windows (and don't define it
+  on purpose) because using an user-mode SSH daemon is implied there (for
+  now.)
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 1854644..569679b 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8260,8 +8260,13 @@ void ONMainWindow::slotRetExportDir ( bool 
result,QString output,
 /*
  * Do the user SSHD/global SSHD dance here and either use the
  * private .x2go/.ssh or the global .ssh dir.
+ *
+ * Note: Windows is implicitly always using an user-mode SSH server.
  */
-if (userSshd) {
+#ifndef Q_OS_WIN
+if (userSshd)
+#endif /* !defined (Q_OS_WIN) */
+{
   authorized_keys_dir = QDir (authorized_keys_dir.absolutePath () + 
"/.x2go/");
 }
 
@@ -9538,15 +9543,23 @@ void ONMainWindow::startX2goMount()
 /*
  * Do the user SSHD/global SSHD dance here and either use the
  * private .x2go/.ssh or the global .ssh dir.
+ *
+ * Note: Windows is implicitly always using an user-mode SSH server.
  */
-if (userSshd) {
+#ifndef Q_OS_WIN
+if (userSshd)
+#endif /* !defined (Q_OS_WIN) */
+{
   authorized_keys_dir = QDir (authorized_keys_dir.absolutePath () + 
"/.x2go/");
 }
 
 authorized_keys_dir = QDir (authorized_keys_dir.absolutePath () + 
"/.ssh/");
 QFile authorized_keys_file (authorized_keys_dir.absolutePath () + 
"/authorized_keys");
 
-if (userSshd) {
+#ifndef Q_OS_WIN
+if (userSshd)
+#endif /* !defined (Q_OS_WIN) */
+{
   x2goDebug << "Creating dir " << authorized_keys_dir.absolutePath ();
   authorized_keys_dir.mkpath (authorized_keys_dir.absolutePath ());
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 197/217: src/x2goutils.cpp: add some debug logging to find_binary ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5f6d6b4023d3a5c6c4a77de958bf4774eb862c67
Author: Mihai Moldovan 
Date:   Wed Jun 22 04:53:13 2016 +0200

src/x2goutils.cpp: add some debug logging to find_binary ().
---
 debian/changelog  |1 +
 src/x2goutils.cpp |4 
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a9b104f..206587b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -360,6 +360,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: remove extraneous newlines from debug output.
 - src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the
   given path to CWD iff it's actually empty. Not the other way around.
+- src/x2goutils.cpp: add some debug logging to find_binary ().
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 45c31df..9612b12 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -321,6 +321,10 @@ QString find_binary (const QString , const QString 
_name) {
 ret = tmp_file_info.canonicalFilePath ();
 break;
   }
+  else {
+x2goDebug << "Binary at " << cur_path << " either does not exist (" << 
!(tmp_file_info.exists ())
+  << ") or is not executable (" << tmp_file_info.isExecutable 
() << ")";
+  }
 }
   }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 196/217: src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the given path to CWD iff it's actually empty. Not the other way around.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 7f543fbd4368133d61b181819278a23b635a28dc
Author: Mihai Moldovan 
Date:   Wed Jun 22 04:51:28 2016 +0200

src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the given 
path to CWD iff it's actually empty. Not the other way around.
---
 debian/changelog  |2 ++
 src/x2goutils.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a338be..a9b104f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -358,6 +358,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   system-PA version.
 - src/pulsemanager.cpp: add warning message boxes where appropriate.
 - src/pulsemanager.cpp: remove extraneous newlines from debug output.
+- src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the
+  given path to CWD iff it's actually empty. Not the other way around.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 25a2b54..45c31df 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -298,7 +298,7 @@ QString find_binary (const QString , const QString 
_name) {
 QString cur_path = "";
 QString tmp_path = path;
 
-if (!(path.isEmpty ())) {
+if (path.isEmpty ()) {
   tmp_path = "./";
 }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 199/217: src/: new file windows_stdint.h for Windows-compatibility when using std::(u)int*_t types.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f732b345de4e62e4248dc0c6aa7abc912baab11a
Author: Mihai Moldovan 
Date:   Mon Jul 4 05:05:05 2016 +0200

src/: new file windows_stdint.h for Windows-compatibility when using 
std::(u)int*_t types.

These are only available with GCC in C++11 mode on Windows for some
reason.
---
 debian/changelog |3 +++
 src/windows_stdint.h |   40 
 2 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f4b5d7..b356a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -362,6 +362,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   given path to CWD iff it's actually empty. Not the other way around.
 - src/x2goutils.cpp: add some debug logging to find_binary ().
 - nsis/x2goclient.nsi: add startup.wav to installer package.
+- src/: new file windows_stdint.h for Windows-compatibility when using
+  std::(u)int*_t types. These are only available with GCC in C++11 mode on
+  Windows for some reason.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/windows_stdint.h b/src/windows_stdint.h
new file mode 100644
index 000..74b2681
--- /dev/null
+++ b/src/windows_stdint.h
@@ -0,0 +1,40 @@
+/***
+ *  Copyright (C) 2012-2016 by Mihai Moldovan  *
+ * *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or  *
+ *  (at your option) any later version.*
+ * *
+ *  This program is distributed in the hope that it will be useful,*
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  *
+ *  GNU General Public License for more details.   *
+ * *
+ *  You should have received a copy of the GNU General Public License  *
+ *  along with this program; if not, write to the  *
+ *  Free Software Foundation, Inc.,*
+ *  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  *
+ ***/
+
+#ifndef WINDOWS_STDINT_H
+#define WINDOWS_STDINT_H
+
+#ifdef Q_OS_WIN
+
+/* We need this ugly hack because Windows doesn't know about std::(u)int*_t 
types. */
+namespace std {
+  typedef signed charint8_t;
+  typedef signed short   int16_t;
+  typedef signed int int32_t;
+  typedef signed long long int   int64_t;
+  typedef unsigned char  uint8_t;
+  typedef unsigned short uint16_t;
+  typedef unsigned int   uint32_t;
+  typedef unsigned long long int uint64_t;
+}
+
+#endif /* defined (Q_OS_WIN) */
+
+
+#endif /* !defined (WINDOWS_STDINT_H) */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 191/217: src/pulsemanager.cpp: fix compile error on Windows.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit cfbd0b1dae5d6d24b340c4bf317b333f91e2ff76
Author: Mihai Moldovan 
Date:   Wed Jun 22 04:04:10 2016 +0200

src/pulsemanager.cpp: fix compile error on Windows.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ce616f..9aa2245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -352,6 +352,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: add error message boxes throughout PulseManager.
   Don't just abort () the program.
 - src/x2goutils.h: fix compile error due to typo.
+- src/pulsemanager.cpp: fix compile error on Windows.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1cb7a7e..1de1cc7 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -704,8 +704,8 @@ void PulseManager::slot_play_startup_sound () {
 play_file_binary += "/../exe/paplay";
 play_file_file += "/../Resources/startup.wav";
 #elif defined (Q_OS_WIN)
-playFileBinary += "/pulse/paplay.exe";
-playFileFile += "/startup.wav";
+play_file_binary += "/pulse/paplay.exe";
+play_file_file += "/startup.wav";
 #else
 /* FIXME: implement Linux section. */
 #endif // defined (Q_OS_DARWIN)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 192/217: src/pulsemanager.cpp: fix startup when using the system-PA version.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit dc05e9df3b0b5a7f1ae4c5134c8be80cf926022f
Author: Mihai Moldovan 
Date:   Wed Jun 22 04:13:44 2016 +0200

src/pulsemanager.cpp: fix startup when using the system-PA version.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |   23 ++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9aa2245..2d8c5be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -353,6 +353,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   Don't just abort () the program.
 - src/x2goutils.h: fix compile error due to typo.
 - src/pulsemanager.cpp: fix compile error on Windows.
+- src/pulsemanager.cpp: fix startup when using the system-PA version.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1de1cc7..9582027 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -269,15 +269,20 @@ void PulseManager::start_generic () {
 void PulseManager::start_osx () {
   server_args_ = QStringList ();
   server_args_ << "--exit-idle-time=-1" << "-n"
-   << "-F" << pulse_dir_.absolutePath () + "/config.pa"
-   << "-p"
-   << QDir (app_dir_
-+ "/../Frameworks/pulse-"
-+ QString::number (pulse_version_major_)
-+ "."
-+ QString::number (pulse_version_minor_)
-+ "/modules").absolutePath ()
-   << "--high-priority";
+   << "-F" << pulse_dir_.absolutePath () + "/config.pa";
+
+  if (!system_pulse_) {
+server_args_ << "-p"
+ << QDir (app_dir_
+  + "/../Frameworks/pulse-"
+  + QString::number (pulse_version_major_)
+  + "."
+  + QString::number (pulse_version_minor_)
+  + "/modules").absolutePath ();
+  }
+
+  server_args_ << "--high-priority";
+
   if (debug_) {
 server_args_ << "--log-level=debug"
  << "--verbose"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 194/217: src/pulsemanager.cpp: add warning message boxes where appropriate.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit bf716665abfc0c349f76fd4225d0dcee5cd38a00
Author: Mihai Moldovan 
Date:   Wed Jun 22 04:19:27 2016 +0200

src/pulsemanager.cpp: add warning message boxes where appropriate.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |   16 
 2 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f249332..a64a801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -356,6 +356,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: fix startup when using the system-PA version.
 - src/pulsemanager.cpp: fix startup sound playback when using the
   system-PA version.
+- src/pulsemanager.cpp: add warning message boxes where appropriate.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index e837a97..223b7df 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -263,6 +263,14 @@ void PulseManager::start_generic () {
   }
   else {
 x2goErrorf (27) << "PulseAudio failed to start! Sound support will not be 
available.";
+show_RichText_WarningMsgBox (tr ("PulseAudio failed to start!"),
+ tr ("Sound support will not be available.\n\n"
+ "If you downloaded the bundled, 
pre-compiled version from the official home page, "
+ "please report a bug on:\n"
+ "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
+   
"https://wiki.x2go.org/doku.php/wiki:bugs;
+ "\n"),
+ true);
   }
 }
 
@@ -731,6 +739,14 @@ void PulseManager::slot_play_startup_sound () {
 }
 else {
   x2goErrorf (26) << "Unable to play startup sound! Something may be 
wrong.";
+  show_RichText_WarningMsgBox (tr ("Unable to play startup sound."),
+   tr ("If you downloaded the bundled, 
pre-compiled version from the official home page "
+   "or the upstream Linux packages, "
+   "please report a bug on:\n"
+   "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
+ 
"https://wiki.x2go.org/doku.php/wiki:bugs;
+   "\n"),
+   true);
 }
   }
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 190/217: debian/changelog: fix typo in function name.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fb194c6b4b4935acf45faf586c5743f43653bce7
Author: Mihai Moldovan 
Date:   Wed Jun 22 03:59:51 2016 +0200

debian/changelog: fix typo in function name.
---
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 65ddc6b..2ce616f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -341,7 +341,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   default prefix as well on OS X.
 - src/pulsemanager.cpp: add comments to Qt 4 code part.
 - src/pulsemanager.cpp: add remainder for Linux-implementation in
-  play_startup_sound ().
+  slot_play_startup_sound ().
 - src/x2goutils.cpp: fix compile error.
 - src/pulsemanager.h: add new system_pulse_ variable to indicate that
   a system PA binary shall be used.

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 189/217: src/x2goutils.h: fix compile error due to typo.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b9d48d96dc0c2992b73015a81cec1fa6916d25d6
Author: Mihai Moldovan 
Date:   Wed Jun 22 03:21:11 2016 +0200

src/x2goutils.h: fix compile error due to typo.
---
 debian/changelog  |1 +
 src/x2goutils.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1e5b9b8..65ddc6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -351,6 +351,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   show_RichText_Generic_MsgBox () and its wrappers.
 - src/pulsemanager.cpp: add error message boxes throughout PulseManager.
   Don't just abort () the program.
+- src/x2goutils.h: fix compile error due to typo.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index ab109c1..25a2b54 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -113,7 +113,7 @@ void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, 
const QString _t
   msg_box.exec ();
 }
 
-void show_RichText_WarningMsgBox (const QString _text, const QString 
_text bool app_modal) {
+void show_RichText_WarningMsgBox (const QString _text, const QString 
_text, bool app_modal) {
   show_RichText_Generic_MsgBox (QMessageBox::Warning, main_text, 
informative_text, app_modal);
 }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 188/217: src/pulsemanager.cpp: add error message boxes throughout PulseManager.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 34f9d9a819129547f0ba0baa332d98606c86a13f
Author: Mihai Moldovan 
Date:   Wed Jun 22 03:14:20 2016 +0200

src/pulsemanager.cpp: add error message boxes throughout PulseManager.

Don't just abort () the program.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   57 +-
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b8573d..1e5b9b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -349,6 +349,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   required.
 - src/x2goutils.{cpp,h}: add application modality parameter to
   show_RichText_Generic_MsgBox () and its wrappers.
+- src/pulsemanager.cpp: add error message boxes throughout PulseManager.
+  Don't just abort () the program.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9ec2da8..1cb7a7e 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -21,14 +21,13 @@
 #include 
 #include 
 
-#if QT_VERSION < 0x05
-#include "x2goutils.h"
-#else /* QT_VERSION < 0x05 */
+#if QT_VERSION >= 0x05
 #include 
-#endif /* QT_VERSION < 0x05 */
+#endif /* QT_VERSION >= 0x05 */
 
 #include "pulsemanager.h"
 #include "x2gologdebug.h"
+#include "x2goutils.h"
 
 PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
 pulse_X2Go_ ("/.x2go/pulse"),
@@ -83,6 +82,13 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
 
 if (server_binary_.isEmpty ()) {
   x2goErrorf (29) << "Unable to find PulseAudio binary. Neither bundled, 
nor found in $PATH nor additional directories.";
+  show_RichText_ErrorMsgBox (tr ("Unable to find PulseAudio binary. 
Neither bundled, nor found in $PATH nor additional directories."),
+ tr ("If you downloaded the bundled, 
pre-compiled version from the official home page, "
+ "please report a bug on:\n"
+ "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
+   
"https://wiki.x2go.org/doku.php/wiki:bugs;
+ "\n"),
+ true);
   abort ();
 }
 else {
@@ -114,6 +120,13 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
 
 if (server_binary_.isEmpty ()) {
   x2goErrorf (28) << "Unable to find PulseAudio binary. Neither 
bundled, nor found in $PATH nor additional directories.";
+  show_RichText_ErrorMsgBox (tr ("Unable to find PulseAudio binary. 
Neither bundled, nor found in $PATH nor additional directories."),
+ tr ("If you downloaded the bundled, 
pre-compiled version from the official home page, "
+ "please report a bug on:\n"
+ "https://wiki.x2go.org/doku.php/wiki:bugs\;>"
+   
"https://wiki.x2go.org/doku.php/wiki:bugs;
+ "\n"),
+ true);
   abort ();
 }
   }
@@ -150,6 +163,9 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
   for (buf = ptr = NULL; ptr == NULL; path_len += 20) {
 if (NULL == (buf = realloc (buf, path_len))) {
   x2goErrorf (16) << "Could not allocate buffer for getting current 
working directory!";
+  show_RichText_ErrorMsgBox (tr ("Could not allocate buffer for getting 
current working directory!"),
+ QString (),
+ true);
   abort ();
 }
 
@@ -157,7 +173,11 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
 ptr = getcwd (buf, path_len);
 
 if ((NULL == ptr) && (ERANGE != erange)) {
-  x2goErrorf (17) << "getcwd() failed: " << QString (strerror (errno));
+  int saved_errno = errno;
+  x2goErrorf (17) << "getcwd() failed: " << QString (strerror 
(saved_errno));
+  show_RichText_ErrorMsgBox (tr ("getcwd() failed!"),
+ QString (strerror (saved_errno)),
+ true);
   abort ();
 }
   }
@@ -365,6 +385,9 @@ void PulseManager::fetch_pulseaudio_version () {
 
   if (!convert_success) {
 x2goErrorf (20) << "Unable to convert major version number 
string to integer.";
+show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio 

[X2Go-Commits] [x2goclient] 180/217: src/x2goutils.{cpp, h}: add new function find_binary ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 7316e7c065f4bd5ca864c84cb1842d960dad7f92
Author: Mihai Moldovan 
Date:   Mon Jun 20 23:52:40 2016 +0200

src/x2goutils.{cpp,h}: add new function find_binary ().

Searches for a specific binary in a colon-separated list of paths.
Really just a compat function, as Qt 5 includes
QStandardPaths::findExecutable ().
---
 debian/changelog  |3 +++
 src/x2goutils.cpp |   37 +
 src/x2goutils.h   |8 
 3 files changed, 48 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad4b865..1f73293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -334,6 +334,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   start binaries like paplay.
 - src/pulsemanager.cpp: don't remove PA config and log file in
   ~/.x2go/pulse on PA shutdown if debugging has been requested.
+- src/x2goutils.{cpp,h}: add new function find_binary (). Searches for a
+  specific binary in a colon-separated list of paths. Really just a compat
+  function, as Qt 5 includes QStandardPaths::findExecutable ().
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 31ac3ac..16ed06e 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "x2goutils.h"
 #include "onmainwindow.h"
@@ -282,4 +283,40 @@ QString add_to_path (const QString _path, const 
QStringList , const boo
 
   return (ret);
 }
+
+QString find_binary (const QString , const QString _name) {
+  QString ret = "";
+
+  if (!(binary_name.isEmpty ())) {
+QString cur_path = "";
+QString tmp_path = path;
+
+if (!(path.isEmpty ())) {
+  tmp_path = "./";
+}
+
+QStringList path_list = tmp_path.split (":");
+
+for (QStringList const_it = path_list.constBegin (); const_it != 
path_list.constEnd (); ++const_it) {
+  cur_path = *const_it;
+
+  if (cur_path.isEmpty ()) {
+cur_path = "./";
+  }
+
+  cur_path = QDir (cur_path).absolutePath ();
+
+  cur_path += "/" + binary_name;
+
+  QFileInfo tmp_file_info = QFileInfo (cur_path);
+
+  if ((tmp_file_info.exists ()) && (tmp_file_info.isExecutable ())) {
+ret = tmp_file_info.canonicalFilePath ();
+break;
+  }
+}
+  }
+
+  return (ret);
+}
 #endif /* defined (Q_OS_DARWIN) */
diff --git a/src/x2goutils.h b/src/x2goutils.h
index e36203e..4159d39 100644
--- a/src/x2goutils.h
+++ b/src/x2goutils.h
@@ -57,6 +57,14 @@ void show_XQuartz_generic_error (const QString _error, 
const QString 
  * Ex.: ::...:
  */
 QString add_to_path (const QString _path, const QStringList , const 
bool back = true);
+
+/*
+ * Returns the first existing path that contains binary_name.
+ * Iff no component contains a binary called binary_name, an empty path is 
returned.
+ *
+ * Iff path is empty, (only) the current working dir is searched.
+ */
+QString find_binary (const QString , const QString _name);
 #endif /* defined (Q_OS_DARWIN) */
 
 #endif /* !defined (X2GOUTILS_H) */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 178/217: src/pulsemanager.cpp: insert PULSE_SERVER and PULSE_COOKIE variables into environment as used by PulseManager.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit aa6977d1039ff3d95d29983613f7739c731864e6
Author: Mihai Moldovan 
Date:   Thu Jun 2 04:23:05 2016 +0200

src/pulsemanager.cpp: insert PULSE_SERVER and PULSE_COOKIE variables into 
environment as used by PulseManager.

Otherwise we won't be able to start binaries like paplay.
---
 debian/changelog |3 +++
 src/pulsemanager.cpp |   13 +
 2 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d34d235..84d3461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -329,6 +329,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: actually only play startup sound if debugging is
   enabled.
 - src/pulsemanager.cpp: don't insert stray newline into config.pa.
+- src/pulsemanager.cpp: insert PULSE_SERVER and PULSE_COOKIE variables
+  into environment as used by PulseManager. Otherwise we won't be able to
+  start binaries like paplay.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 78fed24..539b85b 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -144,6 +144,19 @@ void PulseManager::start_generic () {
 connect (pulse_server_, SIGNAL (finished (int)),
  this,  SLOT (slot_on_pulse_finished (int)));
 
+env_.insert ("PULSE_SERVER", "127.0.0.1:" + QString::number (pulse_port_));
+
+
+QString clean_pulse_dir = pulse_dir_.absolutePath ();
+
+#ifdef Q_OS_WIN
+clean_pulse_dir = wapiShortFileName (clean_pulse_dir);
+#endif /* defined (Q_OS_WIN) */
+
+QString tmp_auth_cookie = QDir::toNativeSeparators (clean_pulse_dir + 
"/.pulse-cookie");
+
+env_.insert ("PULSE_COOKIE", tmp_auth_cookie);
+
 if (debug_) {
   // Give PA a little time to come up.
   QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 182/217: src/pulsemanager.cpp: add comments to Qt 4 code part.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 87b4c4692f2faeb2785bf0382f4346ab59375577
Author: Mihai Moldovan 
Date:   Wed Jun 22 02:20:22 2016 +0200

src/pulsemanager.cpp: add comments to Qt 4 code part.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d51f431..8ed7658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -339,6 +339,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   function, as Qt 5 includes QStandardPaths::findExecutable ().
 - src/pulsemanager.cpp: auto-detect PA binary in $PATH and MacPorts
   default prefix as well on OS X.
+- src/pulsemanager.cpp: add comments to Qt 4 code part.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1e23d89..47e1b7c 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -69,8 +69,8 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
   QString path_val = tmp_env.value ("PATH");
 
   QStringList to_front, to_back;
-  to_front << "/opt/local/bin";
-  to_back << "/usr/local/bin";
+  to_front << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need 
to make that configurable. */
+  to_back << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both 
intermingled... */
 
   add_to_path (path_val, to_back);
   add_to_path (path_val, to_front, false);

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 179/217: src/pulsemanager.cpp: don't remove PA config and log file in ~/.x2go/pulse on PA shutdown if debugging has been requested.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 76cbe471c8f3b43a122b176c7564d48043d4355c
Author: Mihai Moldovan 
Date:   Thu Jun 2 04:24:38 2016 +0200

src/pulsemanager.cpp: don't remove PA config and log file in ~/.x2go/pulse 
on PA shutdown if debugging has been requested.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   10 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84d3461..ad4b865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -332,6 +332,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: insert PULSE_SERVER and PULSE_COOKIE variables
   into environment as used by PulseManager. Otherwise we won't be able to
   start binaries like paplay.
+- src/pulsemanager.cpp: don't remove PA config and log file in
+  ~/.x2go/pulse on PA shutdown if debugging has been requested.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 539b85b..ce7ba24 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -619,10 +619,12 @@ void PulseManager::slot_on_pulse_finished (int exit_code) 
{
 
 #if defined (Q_OS_DARWIN) || defined (Q_OS_WIN)
   // Remove server config file, otherwise the directory won't be empty.
-  work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
-   + 
"/config.pa").absolutePath ()));
-  work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
-   + 
"/pulse.log").absolutePath ()));
+  if (!debug_) {
+work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ + 
"/config.pa").absolutePath ()));
+work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ + 
"/pulse.log").absolutePath ()));
+  }
 #else // Linux
   // FIXME.
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 181/217: src/pulsemanager.cpp: auto-detect PA binary in $PATH and MacPorts default prefix as well on OS X.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 03e96e7ab23bf1a0f2c35263937f8bc02cd721a2
Author: Mihai Moldovan 
Date:   Mon Jun 20 23:58:12 2016 +0200

src/pulsemanager.cpp: auto-detect PA binary in $PATH and MacPorts default 
prefix as well on OS X.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   67 ++
 2 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1f73293..d51f431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -337,6 +337,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/x2goutils.{cpp,h}: add new function find_binary (). Searches for a
   specific binary in a colon-separated list of paths. Really just a compat
   function, as Qt 5 includes QStandardPaths::findExecutable ().
+- src/pulsemanager.cpp: auto-detect PA binary in $PATH and MacPorts
+  default prefix as well on OS X.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ce7ba24..1e23d89 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -21,6 +21,12 @@
 #include 
 #include 
 
+#if QT_VERSION < 0x05
+#include "x2goutils.h"
+#else /* QT_VERSION < 0x05 */
+#include 
+#endif /* QT_VERSION < 0x05 */
+
 #include "pulsemanager.h"
 #include "x2gologdebug.h"
 
@@ -54,8 +60,69 @@ PulseManager::PulseManager () : app_dir_ 
(QApplication::applicationDirPath ()),
 
   /* Set server binary and working dir paths. */
 #ifdef Q_OS_DARWIN
+  /* Assume bundled PA first. */
   server_working_dir_ = QString (app_dir_ + "/../exe/");
   server_binary_ = QString (server_working_dir_ + "/pulseaudio");
+
+#if QT_VERSION < 0x05
+  QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment ();
+  QString path_val = tmp_env.value ("PATH");
+
+  QStringList to_front, to_back;
+  to_front << "/opt/local/bin";
+  to_back << "/usr/local/bin";
+
+  add_to_path (path_val, to_back);
+  add_to_path (path_val, to_front, false);
+
+  server_binary_ = find_binary (server_working_dir_, "pulseaudio");
+
+  if (server_binary_.isEmpty ()) {
+server_binary_ = find_binary (path_val, "pulseaudio");
+
+if (server_binary_.isEmpty ()) {
+  x2goErrorf (29) << "Unable to find PulseAudio binary. Neither bundled, 
nor found in $PATH nor additional directories.";
+  abort ();
+}
+  }
+#else /* QT_VERSION < 0x05 */
+  QStringList search_paths;
+  search_paths << server_working_dir_;
+
+  server_binary_ = QStandardPaths::findExecutable ("pulseaudio", search_paths);
+
+  if (server_binary_.isEmpty ()) {
+search_paths = QStringList ();
+search_paths << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might 
need to make that configurable. */
+
+server_binary_ = QStandardPaths::findExecutable ("pulseaudio", 
search_paths);
+
+if (server_binary_.isEmpty ()) {
+  search_paths = QStringList ();
+
+  server_binary_ = QStandardPaths::findExecutable ("pulseaudio", 
search_paths);
+
+  if (server_binary_.isEmpty ()) {
+search_paths = QStringList ();
+search_paths << "/usr/local/bin"; /* Homebrew or random stuff. 
Probably even both intermingled... */
+
+server_binary_ = QStandardPaths::findExecutable ("pulseaudio", 
search_paths);
+
+if (server_binary_.isEmpty ()) {
+  x2goErrorf (28) << "Unable to find PulseAudio binary. Neither 
bundled, nor found in $PATH nor additional directories.";
+  abort ();
+}
+  }
+}
+  }
+#endif /* QT_VERSION < 0x05 */
+
+  QFileInfo tmp_file_info = QFileInfo (server_binary_);
+  server_working_dir_ = tmp_file_info.canonicalPath ();
+
+  x2goDebug << "Found PA binary as " << server_binary_ << endl;
+  x2goDebug << "Corresponding working dir: " << server_working_dir_ << endl;
+
 #elif defined (Q_OS_WIN)
   server_working_dir_ = QString (app_dir_ + "/pulse/");
   server_binary_ = QString (app_dir_ + "/pulse/pulseaudio.exe");

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 175/217: src/pulsemanager.{cpp, h}: rename on_pulse_finished () to slot_on_pulse_finished ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit cc14c215ffab0ad90de31c04f365bb7f122df6e2
Author: Mihai Moldovan 
Date:   Thu Jun 2 01:08:50 2016 +0200

src/pulsemanager.{cpp,h}: rename on_pulse_finished () to 
slot_on_pulse_finished ().

Oops...
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |2 +-
 src/pulsemanager.h   |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f30ce8..c11cafc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -324,6 +324,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: don't overwrite the temporary string variable for
   the current line with what was supposed to hold new data in
   fetch_pulseaudio_version ().
+- src/pulsemanager.{cpp,h}: rename on_pulse_finished () to
+  slot_on_pulse_finished (). Oops...
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 032c018..ec08e6f 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -584,7 +584,7 @@ void PulseManager::slot_play_startup_sound () {
   }
 }
 
-void PulseManager::on_pulse_finished (int exit_code) {
+void PulseManager::slot_on_pulse_finished (int exit_code) {
   if (!exit_code)
 x2goDebug << "Warning! Pulseaudio's exit code is non-zero.";
 
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index b3b7421..4cd49e4 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -86,7 +86,7 @@ class PulseManager: public QObject {
 
 
   private slots:
-void on_pulse_finished (int exit_code);
+void slot_on_pulse_finished (int exit_code);
 void slot_play_startup_sound ();
 
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 176/217: src/pulsemanager.cpp: actually only play startup sound if debugging is enabled.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fc07778cc5e1b42f6ee4facdf6b0c9e54ddf811c
Author: Mihai Moldovan 
Date:   Thu Jun 2 04:20:10 2016 +0200

src/pulsemanager.cpp: actually only play startup sound if debugging is 
enabled.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c11cafc..3629aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -326,6 +326,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   fetch_pulseaudio_version ().
 - src/pulsemanager.{cpp,h}: rename on_pulse_finished () to
   slot_on_pulse_finished (). Oops...
+- src/pulsemanager.cpp: actually only play startup sound if debugging is
+  enabled.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ec08e6f..eec54a0 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -557,7 +557,7 @@ void PulseManager::create_client_dir () {
 }
 
 void PulseManager::slot_play_startup_sound () {
-  if (!debug_) {
+  if (debug_) {
 QProcess play_file (0);
 QString play_file_binary (app_dir_);
 QString play_file_file (play_file_binary);

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 177/217: src/pulsemanager.cpp: don't insert stray newline into config.pa.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 1d9a7e1e947ef8996810779dd43adc9ebd338720
Author: Mihai Moldovan 
Date:   Thu Jun 2 04:21:02 2016 +0200

src/pulsemanager.cpp: don't insert stray newline into config.pa.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3629aee..d34d235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -328,6 +328,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   slot_on_pulse_finished (). Oops...
 - src/pulsemanager.cpp: actually only play startup sound if debugging is
   enabled.
+- src/pulsemanager.cpp: don't insert stray newline into config.pa.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index eec54a0..78fed24 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -474,7 +474,6 @@ bool PulseManager::generate_server_config () {
 else {
   config_tmp_file_stream << "1";
 }
-config_tmp_file_stream << endl;
 
 config_tmp_file_stream << " playback=";
 if (!playback_) {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 172/217: macbuild.sh: save return value of parse_otool_output ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f30b6b4da08d3cf5eeb8393644edf1a8974da7d2
Author: Mihai Moldovan 
Date:   Thu May 12 23:24:03 2016 +0200

macbuild.sh: save return value of parse_otool_output ().

Otherwise we'll fetch the return value of "set", which is not really
what we need.
---
 debian/changelog |2 ++
 macbuild.sh  |4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index edf6262..d686a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -316,6 +316,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: fix copying of resource files.
 - macbuild.sh: also add PA binaries to deduplication fixup list.
 - macbuild.sh: don't error out while executing parse_otool_output ().
+- macbuild.sh: save return value of parse_otool_output (). Otherwise we'll
+  fetch the return value of "set", which is not really what we need.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index 62afe22..5e7b336 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -515,6 +515,7 @@ if [ "${BUNDLE}" = "1" ]; then
   # Try to fixup files broken by duplicates removal.
   for all_entry in "${all_files[@]}"; do
 typeset otool_out="$(otool -L "${all_entry}")"
+typeset -i tmp_ret="0"
 
 # Don't merge the declaration and initialization with the real value 
assignment.
 # We need the return value of parse_otool_output(), but running
@@ -522,9 +523,10 @@ if [ "${BUNDLE}" = "1" ]; then
 typeset dependencies=""
 set +e
 dependencies="$(parse_otool_output "${otool_out}")"
+tmp_ret="${?}"
 set -e
 
-if [ "${?}" -eq "0" ]; then
+if [ "${tmp_ret}" -eq "0" ]; then
   typeset line=""
   while read -r line; do
 #echo "dependency of ${all_entry}: ${line}"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 168/217: res: rename "sound" to "audio".

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 868dd0f04cfd0bd7e84069aea1da09444307c78c
Author: Mihai Moldovan 
Date:   Sat May 7 22:46:06 2016 +0200

res: rename "sound" to "audio".
---
 debian/changelog |1 +
 res/{sound => audio}/startup.wav |  Bin 211244 -> 211244 bytes
 2 files changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 2efbb5b..7b1b5d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -312,6 +312,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   "Handle" errors by printing out debug messages.
 - macbuild.sh: add support for copying resource files. Currently only used
   for startup.wav.
+- res: rename "sound" to "audio".
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/res/sound/startup.wav b/res/audio/startup.wav
similarity index 100%
rename from res/sound/startup.wav
rename to res/audio/startup.wav

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 167/217: macbuild.sh: add support for copying resource files.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit e6b7b952ec2ac16f6813d2e735507142daffe687
Author: Mihai Moldovan 
Date:   Sat May 7 22:38:37 2016 +0200

macbuild.sh: add support for copying resource files.

Currently only used for startup.wav.
---
 debian/changelog |2 ++
 macbuild.sh  |8 
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d944d41..2efbb5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -310,6 +310,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   daemon in debug mode.
 - src/pulsemanager.cpp: don't time out while trying to start PA or paplay.
   "Handle" errors by printing out debug messages.
+- macbuild.sh: add support for copying resource files. Currently only used
+  for startup.wav.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index d5aadfe..f57d43c 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -158,6 +158,7 @@ BUILD_DIR="${TOP_DIR}/client_build"
 APPBUNDLE="${BUILD_DIR}/${NAME}.app"
 EXE_DIR="${APPBUNDLE}/Contents/exe/"
 FRAMEWORKS_DIR="${APPBUNDLE}/Contents/Frameworks/"
+RESOURCES_DIR="${APPBUNDLE}/Contents/Resources/"
 DMGFILE="${BUILD_DIR}/${NAME}.dmg"
 PROJECT="${TOP_DIR}/${NAME}.pro"
 PKG_DMG="${TOP_DIR}/pkg-dmg"
@@ -179,6 +180,7 @@ PULSEAUDIO_BINARIES=( "pulseaudio" "esdcompat" "pacat" 
"pacmd"  "pactl"
 PULSEAUDIO_LIBRARIES=( "libpulse-simple.0.dylib"
"pulse-8.0"
"pulseaudio" )
+RESOURCE_FILES=( "audio/startup.wav" )
 
 typeset -a special_files_regex
 special_files_regex+=( "pulseaudio/libpulsecommon-[0-9]\.[0-9]\.dylib"
@@ -328,6 +330,12 @@ mkdir -p "${FRAMEWORKS_DIR}/"
 phase "Copying nxproxy"
 cp -av "${NXPROXY}" "${EXE_DIR}/"
 
+phase "Copying misc resources"
+typeset cur_res_file
+for cur_res_file in ${RESOURCE_FILES[@]}; do
+  cp -av "res/${cur_res_file}" "${RESOURCES_DIR}/"
+done
+
 phase "Copying PulseAudio"
 for cur_binary in ${PULSEAUDIO_BINARIES_FULL[@]}; do
   cp -av "${cur_binary}" "${EXE_DIR}/"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 171/217: macbuild.sh: don't error out while executing parse_otool_output ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ae8a73f05f2be28ec792439ae271b92435180eec
Author: Mihai Moldovan 
Date:   Thu May 12 23:22:13 2016 +0200

macbuild.sh: don't error out while executing parse_otool_output ().
---
 debian/changelog |1 +
 macbuild.sh  |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2079ee6..edf6262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -315,6 +315,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - res: rename "sound" to "audio".
 - macbuild.sh: fix copying of resource files.
 - macbuild.sh: also add PA binaries to deduplication fixup list.
+- macbuild.sh: don't error out while executing parse_otool_output ().
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index f580d44..62afe22 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -520,7 +520,9 @@ if [ "${BUNDLE}" = "1" ]; then
 # We need the return value of parse_otool_output(), but running
 # typeset foo="$(bar)" will give us the return value of typeset, not bar().
 typeset dependencies=""
+set +e
 dependencies="$(parse_otool_output "${otool_out}")"
+set -e
 
 if [ "${?}" -eq "0" ]; then
   typeset line=""

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 170/217: macbuild.sh: also add PA binaries to deduplication fixup list.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 80319a86ed2658b2dab788c20d8629937251a4bb
Author: Mihai Moldovan 
Date:   Thu May 12 23:18:23 2016 +0200

macbuild.sh: also add PA binaries to deduplication fixup list.
---
 debian/changelog |1 +
 macbuild.sh  |7 +++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2ed5430..2079ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -314,6 +314,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   for startup.wav.
 - res: rename "sound" to "audio".
 - macbuild.sh: fix copying of resource files.
+- macbuild.sh: also add PA binaries to deduplication fixup list.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index 6e36348..f580d44 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -505,6 +505,13 @@ if [ "${BUNDLE}" = "1" ]; then
 done
   done
 
+  # Add binaries to all_files as well.
+  typeset entry=""
+  while read -r -d '' entry; do
+echo "Adding ${entry} to all files"
+all_files+=( "${entry}" )
+  done < <(find "${EXE_DIR}" -type 'f' -executable -print0)
+
   # Try to fixup files broken by duplicates removal.
   for all_entry in "${all_files[@]}"; do
 typeset otool_out="$(otool -L "${all_entry}")"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 169/217: macbuild.sh: fix copying of resource files.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f56df66effd500ab14ab0cf1c181a47bf833f6f1
Author: Mihai Moldovan 
Date:   Sat May 7 22:55:50 2016 +0200

macbuild.sh: fix copying of resource files.
---
 debian/changelog |1 +
 macbuild.sh  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7b1b5d9..2ed5430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -313,6 +313,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: add support for copying resource files. Currently only used
   for startup.wav.
 - res: rename "sound" to "audio".
+- macbuild.sh: fix copying of resource files.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index f57d43c..6e36348 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -333,7 +333,7 @@ cp -av "${NXPROXY}" "${EXE_DIR}/"
 phase "Copying misc resources"
 typeset cur_res_file
 for cur_res_file in ${RESOURCE_FILES[@]}; do
-  cp -av "res/${cur_res_file}" "${RESOURCES_DIR}/"
+  cp -av "${TOP_DIR}/res/${cur_res_file}" "${RESOURCES_DIR}/"
 done
 
 phase "Copying PulseAudio"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 166/217: src/pulsemanager.cpp: don't time out while trying to start PA or paplay.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b03cf757c74066ebab4802fa376ae3fbd05785d4
Author: Mihai Moldovan 
Date:   Sat May 7 22:28:38 2016 +0200

src/pulsemanager.cpp: don't time out while trying to start PA or paplay.

"Handle" errors by printing out debug messages.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   16 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40a3caf..d944d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -308,6 +308,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   declaration for set_debug ().
 - res/sound: add startup.wav sound to be played back when starting the PA
   daemon in debug mode.
+- src/pulsemanager.cpp: don't time out while trying to start PA or paplay.
+  "Handle" errors by printing out debug messages.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ed841eb..ee6c63c 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -132,7 +132,12 @@ void PulseManager::start_generic () {
   pulse_server_->setWorkingDirectory (server_working_dir_);
 
   pulse_server_->start (server_binary_, server_args_);
-  if (pulse_server_->waitForStarted ()) {
+
+  /*
+   * We may wait here, because PulseManager runs in a separate thread.
+   * Otherwise, we'd better use signals and slots to not block the main thread.
+   */
+  if (pulse_server_->waitForStarted (-1)) {
 x2goDebug << "pulse started with arguments" << server_args_ << "; waiting 
for finish...";
 state_ = QProcess::Running;
 
@@ -144,6 +149,9 @@ void PulseManager::start_generic () {
   QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
 }
   }
+  else {
+x2goErrorf (27) << "PulseAudio failed to start! Sound support will not be 
available.";
+  }
 }
 
 void PulseManager::start_osx () {
@@ -562,8 +570,12 @@ void PulseManager::slot_play_startup_sound () {
 play_file.setProcessEnvironment (env_);
 play_file.start (play_file_binary, args);
 
-if (play_file.waitForStarted ())
+if (play_file.waitForStarted (-1)) {
   play_file.waitForFinished ();
+}
+else {
+  x2goErrorf (26) << "Unable to play startup sound! Something may be 
wrong.";
+}
   }
 }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 165/217: res/sound: add startup.wav sound to be played back when starting the PA daemon in debug mode.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f929b52b304a77ba7f4374a42b846b547259133f
Author: Mihai Moldovan 
Date:   Sat May 7 22:04:25 2016 +0200

res/sound: add startup.wav sound to be played back when starting the PA 
daemon in debug mode.
---
 debian/changelog  |2 ++
 res/sound/startup.wav |  Bin 0 -> 211244 bytes
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 004005a..40a3caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -306,6 +306,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/onmainwindow.cpp: port to new debugging feature of PulseManager.
 - src/pulsemanager.h: fix compile error due to mismatching function
   declaration for set_debug ().
+- res/sound: add startup.wav sound to be played back when starting the PA
+  daemon in debug mode.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/res/sound/startup.wav b/res/sound/startup.wav
new file mode 100644
index 000..f6b4ff2
Binary files /dev/null and b/res/sound/startup.wav differ

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 163/217: src/onmainwindow.cpp: port to new debugging feature of PulseManager.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit c1b5a667fbd6699d580a69d88afe7c9318b17a26
Author: Mihai Moldovan 
Date:   Sat May 7 03:10:34 2016 +0200

src/onmainwindow.cpp: port to new debugging feature of PulseManager.
---
 debian/changelog |1 +
 src/onmainwindow.cpp |9 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ceab0f3..4b969fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -303,6 +303,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   we'll get compile failures on non-Windows platforms.
 - src/pulsemanager.{cpp,h}: add debugging setter and private variable.
 - src/pulsemanager.{cpp,h}: port to new debugging feature.
+- src/onmainwindow.cpp: port to new debugging feature of PulseManager.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index fab092f..1854644 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -2129,7 +2129,12 @@ void ONMainWindow::slotConfig()
  (QVariant) false).toBool 
();
 
 if (oldDisableInput != newDisableInput) {
-pulseManager->set_record (!newDisableInput);
+bool ret = pulseManager->set_record (!newDisableInput);
+
+if (!ret) {
+  x2goDebug << "Failed to change recording status of PulseManager. 
PulseAudio not started?" << endl;
+}
+
 pulseManager->restart ();
 }
 #endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
@@ -6497,6 +6502,8 @@ void ONMainWindow::pulseManagerWrapper () {
 pulseManagerThread = new QThread (0);
 pulseManager = new PulseManager ();
 
+pulseManager->set_debug (debugging);
+
 pulseManager->moveToThread (pulseManagerThread);
 
 /*

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 162/217: src/pulsemanager.{cpp, h}: port to new debugging feature.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 91a5436e6f6d725907d4080496d7b7346c664c87
Author: Mihai Moldovan 
Date:   Sat May 7 03:02:26 2016 +0200

src/pulsemanager.{cpp,h}: port to new debugging feature.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |   69 +-
 src/pulsemanager.h   |   11 +---
 3 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64528ad..ceab0f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -302,6 +302,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: hide Windows-only code behind #ifdefs. Otherwise
   we'll get compile failures on non-Windows platforms.
 - src/pulsemanager.{cpp,h}: add debugging setter and private variable.
+- src/pulsemanager.{cpp,h}: port to new debugging feature.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 6fe8418..ed841eb 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -24,11 +24,6 @@
 #include "pulsemanager.h"
 #include "x2gologdebug.h"
 
-#ifndef DEBUG
-#define DEBUG_UNDEF
-#define DEBUG
-#endif // defined (NDEBUG)
-
 PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
 pulse_X2Go_ ("/.x2go/pulse"),
 server_binary_ (QString ("")),
@@ -144,10 +139,10 @@ void PulseManager::start_generic () {
 connect (pulse_server_, SIGNAL (finished (int)),
  this,  SLOT (slot_on_pulse_finished (int)));
 
-#ifdef DEBUG
-// Give PA a little time to come up.
-QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
-#endif // defined (DEBUG)
+if (debug_) {
+  // Give PA a little time to come up.
+  QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
+}
   }
 }
 
@@ -163,11 +158,11 @@ void PulseManager::start_osx () {
 + QString::number (pulse_version_minor_)
 + "/modules").absolutePath ()
<< "--high-priority";
-#ifdef DEBUG
-  server_args_ << "--log-level=debug"
-   << "--verbose"
-   << "--log-target=file:" + pulse_dir_.absolutePath () + 
"/pulse.log";
-#endif // defined (DEBUG)
+  if (debug_) {
+server_args_ << "--log-level=debug"
+ << "--verbose"
+ << "--log-target=file:" + pulse_dir_.absolutePath () + 
"/pulse.log";
+  }
 
   if (generate_server_config () && generate_client_config ()) {
 cleanup_client_dir ();
@@ -191,12 +186,11 @@ void PulseManager::start_win () {
   + "."
   + QString::number 
(pulse_version_minor_)
   + 
"/modules/").absolutePath ());
-#ifdef DEBUG
-  /* FIXME: need a way to request debugging. */
-  server_args_ << "--log-level=debug"
-   << "--verbose"
-   << "--log-target=file:" + pulse_dir_.absolutePath () + 
"\\pulse.log";
-#endif // defined (DEBUG)
+  if (debug_) {
+server_args_ << "--log-level=debug"
+ << "--verbose"
+ << "--log-target=file:" + pulse_dir_.absolutePath () + 
"\\pulse.log";
+  }
 
   /*
* Fix for x2goclient bug #526.
@@ -550,27 +544,27 @@ void PulseManager::create_client_dir () {
 }
 
 void PulseManager::slot_play_startup_sound () {
-#ifdef DEBUG
-  QProcess play_file (0);
-  QString play_file_binary (app_dir_);
-  QString play_file_file (play_file_binary);
+  if (!debug_) {
+QProcess play_file (0);
+QString play_file_binary (app_dir_);
+QString play_file_file (play_file_binary);
 
 #ifdef Q_OS_DARWIN
-  play_file_binary += "/../exe/paplay";
-  play_file_file += "/../Resources/startup.wav";
+play_file_binary += "/../exe/paplay";
+play_file_file += "/../Resources/startup.wav";
 #elif defined (Q_OS_WIN)
-  playFileBinary += "/pulse/paplay.exe";
-  playFileFile += "/startup.wav";
+playFileBinary += "/pulse/paplay.exe";
+playFileFile += "/startup.wav";
 #endif // defined (Q_OS_DARWIN)
 
-  QStringList args (play_file_file);
-  play_file.setWorkingDirectory (server_working_dir_);
-  play_file.setProcessEnvironment (env_);
-  play_file.start (play_file_binary, args);
+QStringList args (play_file_file);
+play_file.setWorkingDirectory (server_working_dir_);
+play_file.setProcessEnvironment (env_);
+play_file.start (play_file_binary, args);
 
-  if (play_file.waitForStarted ())
-play_file.waitForFinished ();
-#endif // defined (DEBUG)
+if (play_file.waitForStarted ())
+  

[X2Go-Commits] [x2goclient] 158/217: src/onmainwindow.cpp: make use of new PulseManager::start () behavior and always use it, no matter whether server is up already or not.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 701f3fbf0716cea9b3002ea84d282d66cef0d97b
Author: Mihai Moldovan 
Date:   Fri May 6 23:45:55 2016 +0200

src/onmainwindow.cpp: make use of new PulseManager::start () behavior and 
always use it, no matter whether server is up already or not.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |6 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dc703cd..d12a062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -296,6 +296,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/onmainwindow.cpp: fix compile error due to misuse of #ifdef.
 - src/onmainwindow.cpp: convert QDir object to QString for further
   processing.
+- src/onmainwindow.cpp: make use of new PulseManager::start () behavior
+  and always use it, no matter whether server is up already or not.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 6561915..fab092f 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5067,7 +5067,11 @@ void ONMainWindow::slotRetResumeSess ( bool result,
 true ).toBool();
 
 #if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
-if ((sound) && (!(pulseManager->is_server_running ( {
+if (sound) {
+/*
+ * PulseManager::start () can be called even if the server
+ * is already started. In this case, it will do nothing.
+ */
 pulseManager->start ();
 }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 156/217: src/onmainwindow.cpp: fix compile error due to misuse of #ifdef.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 77cc7bf503a4a979b15880c4216d83e0e15e23e7
Author: Mihai Moldovan 
Date:   Fri May 6 23:41:52 2016 +0200

src/onmainwindow.cpp: fix compile error due to misuse of #ifdef.
---
 debian/changelog |1 +
 src/onmainwindow.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5c52b24..564c20f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -293,6 +293,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   names.
 - src/pulsemanager.cpp: let start () act as a wrapper and do nothing if
   the PA server is already running.
+- src/onmainwindow.cpp: fix compile error due to misuse of #ifdef.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 870825c..d753c14 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -1517,7 +1517,7 @@ void ONMainWindow::closeClient()
 }
 #endif /* defined (Q_OS_DARWIN) || defined (Q_OS_WIN) */
 
-#ifndef (Q_OS_WIN)
+#ifndef Q_OS_WIN
 if ( userSshd && sshd )
 {
 x2goDebug<<"Terminating the OpenSSH server ...";

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 160/217: src/pulsemanager.cpp: hide Windows-only code behind #ifdefs.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b27e474887a3908f7217058ed45b22ad6172d94c
Author: Mihai Moldovan 
Date:   Fri May 6 23:49:35 2016 +0200

src/pulsemanager.cpp: hide Windows-only code behind #ifdefs.

Otherwise we'll get compile failures on non-Windows platforms.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   17 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2685d5..85fc0df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -299,6 +299,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/onmainwindow.cpp: make use of new PulseManager::start () behavior
   and always use it, no matter whether server is up already or not.
 - src/pulsemanager.cpp: fix compile error due to typo.
+- src/pulsemanager.cpp: hide Windows-only code behind #ifdefs. Otherwise
+  we'll get compile failures on non-Windows platforms.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ca7926c..21049ca 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -176,6 +176,11 @@ void PulseManager::start_osx () {
 }
 
 void PulseManager::start_win () {
+/*
+ * Some code in here is Windows-specific and will lead to compile
+ * failures on other platforms. Make this a stub for everything non-Windows.
+ */
+#ifdef Q_OS_WIN
   server_args_ = QStringList ();
   server_args_ << "--exit-idle-time=-1" << "-n"
<< "-F" << QDir::toNativeSeparators (QDir 
(pulse_dir_.absolutePath ()
@@ -215,6 +220,7 @@ void PulseManager::start_win () {
 
 start_generic ();
   }
+#endif /* defined (Q_OS_WIN) */
 }
 
 void PulseManager::start_linux () {
@@ -419,11 +425,18 @@ bool PulseManager::generate_server_config () {
  * The absolute path works with at least 5.0 and 6.0.
  */
 if (pulse_version_major_ > 2) {
-  QString tmp_auth_cookie = QDir::toNativeSeparators (wapiShortFileName 
(pulse_dir_.absolutePath ()))
-  + "\\.pulse-cookie";
+  QString clean_pulse_dir = pulse_dir_.absolutePath ();
+
+#ifdef Q_OS_WIN
+  clean_pulse_dir = wapiShortFileName (clean_pulse_dir);
+#endif /* defined (Q_OS_WIN) */
 
+  QString tmp_auth_cookie = QDir::toNativeSeparators (clean_pulse_dir + 
"/.pulse-cookie");
+
+#ifdef Q_OS_WIN
   /* Double backslashes are required in config.pa. */
   tmp_auth_cookie.replace ("\\", "");
+#endif /* defined (Q_OS_WIN) */
 
   config_tmp_file_stream << " auth-cookie=" + tmp_auth_cookie;
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 159/217: src/pulsemanager.cpp: fix compile error due to typo.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fe76c28e88349b73097bd86e6c24ed5d8a69a55e
Author: Mihai Moldovan 
Date:   Fri May 6 23:47:53 2016 +0200

src/pulsemanager.cpp: fix compile error due to typo.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d12a062..b2685d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -298,6 +298,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   processing.
 - src/onmainwindow.cpp: make use of new PulseManager::start () behavior
   and always use it, no matter whether server is up already or not.
+- src/pulsemanager.cpp: fix compile error due to typo.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 98f2a97..ca7926c 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -165,7 +165,7 @@ void PulseManager::start_osx () {
 #ifdef DEBUG
   server_args_ << "--log-level=debug"
<< "--verbose"
-   << "--log-target=file:" pulse_dir_.absolutePath () + 
"/pulse.log";
+   << "--log-target=file:" + pulse_dir_.absolutePath () + 
"/pulse.log";
 #endif // defined (DEBUG)
 
   if (generate_server_config () && generate_client_config ()) {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 154/217: src/onmainwindow.cpp: fix compile errors due to misspelled function names.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit d26d98224627c7f12120f6cf4fa4f43b173f34e9
Author: Mihai Moldovan 
Date:   Wed May 4 23:54:20 2016 +0200

src/onmainwindow.cpp: fix compile errors due to misspelled function names.
---
 debian/changelog |2 ++
 src/onmainwindow.cpp |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71fa43b..b82095a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -289,6 +289,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   to stdout.
 - src/configdialog.cpp: fix compile error by removing obsolete (and now
   faulty) line for removed restart message.
+- src/onmainwindow.cpp: fix compile errors due to misspelled function
+  names.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 8e5d88a..870825c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5073,10 +5073,10 @@ void ONMainWindow::slotRetResumeSess ( bool result,
 
 switch (sndSystem) {
 case PULSE:
-sndPort = QString::number (pulseManager->getPulsePort ());
+sndPort = QString::number (pulseManager->get_pulse_port ());
 break;
 case ESD:
-sndPort = QString::number (pulseManager->getEsdPort ());
+sndPort = QString::number (pulseManager->get_esd_port ());
 break;
 }
 #endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 148/217: src/configdialog.cpp: whitespace only.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 6b72065676babe6665daa718c58284839d0e5d6b
Author: Mihai Moldovan 
Date:   Fri Apr 29 02:08:03 2016 +0200

src/configdialog.cpp: whitespace only.
---
 debian/changelog |1 +
 src/configdialog.cpp |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 238504c..cff101a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -279,6 +279,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: backport fix for 422.
 - src/configdialog.{cpp,h}: add "no record" support for OS X (through
   PulseManager.)
+- src/configdialog.cpp: whitespace only.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 93c0225..2dfcf397 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -263,6 +263,7 @@ ConfigDialog::ConfigDialog ( QWidget * parent,  
Qt::WindowFlags f )
 sshLay->addStretch();
 frLay->addLayout ( sshLay );
 #endif
+
 if ( embedMode )
 {
 cbStartEmbed=new QCheckBox (
@@ -415,6 +416,7 @@ void ConfigDialog::slot_accepted()
 st.setting()->setValue ( "clientport",
  ( QVariant ) clientSshPort->value() );
 #endif
+
 pwid->saveSettings();
 if ( embedMode )
 {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 149/217: src/onmainwindow.{cpp, h}: hook PulseManager in - for both OS X and Windows.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 6b4e636e6cb4eff70ef6e5adea0108a67dfc04db
Author: Mihai Moldovan 
Date:   Wed May 4 23:23:07 2016 +0200

src/onmainwindow.{cpp,h}: hook PulseManager in - for both OS X and Windows.
---
 debian/changelog |2 +
 src/onmainwindow.cpp |  349 ++
 src/onmainwindow.h   |   38 +++---
 3 files changed, 117 insertions(+), 272 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cff101a..5ea8e30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -280,6 +280,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/configdialog.{cpp,h}: add "no record" support for OS X (through
   PulseManager.)
 - src/configdialog.cpp: whitespace only.
+- src/onmainwindow.{cpp,h}: hook PulseManager in - for both OS X and
+  Windows.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index bc046a6..8e5d88a 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -148,10 +148,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) 
:QMainWindow ( parent )
 
 #ifdef Q_OS_WIN
 clientSshPort="7022";
-pulsePort=4713;
-pulseStarted=false;
 X2goSettings st ( "settings" );
-pulseNoRecord=st.setting()->value ( "pulse/norecord", false ).toBool();
 winSshdStarted=false;
 #else
 userSshd=false;
@@ -174,7 +171,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow 
( parent )
 
 #ifdef Q_OS_WIN
 pulseVersionTest=0l;
-pulseServer=0l;
 xorg=0l;
 xDisplay=0;
 #endif
@@ -462,6 +458,10 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) 
:QMainWindow ( parent )
 QTimer::singleShot ( 500, this, SLOT ( startWinServers() ) );
 #endif
 
+/* FIXME: add Linux. */
+#if defined (Q_OS_DARWIN) || defined (Q_OS_WIN)
+QTimer::singleShot (500, this, SLOT (pulseManagerWrapper ()));
+#endif /* defined (Q_OS_DARWIN) || defined (Q_OS_WIN) */
 
 mainL->setSpacing ( 0 );
 mainL->setMargin ( 0 );
@@ -1488,24 +1488,6 @@ void ONMainWindow::closeClient()
 }
 #endif
 #ifdef Q_OS_WIN
-if ( pulseServer && pulseStarted )
-{
-x2goDebug<<"Deleting the pulse timer ...";
-delete pulseTimer;
-x2goDebug<<"Deleted the pulse timer.";
-x2goDebug<<"Killing the PulseAudio sound server ...";
-pulseServer->kill();
-x2goDebug<<"Killed the PulseAudio sound server.";
-x2goDebug<<"Deleting the PulseAudio process ...";
-delete pulseServer;
-x2goDebug<<"Deleted the PulseAudio process.";
-
-QDir dr ( homeDir );
-dr.remove ( pulseDir+"/config.pa" );
-dr.remove ( pulseDir+"/pulse-pulseuser/pid" );
-dr.rmdir ( pulseDir+"/pulse-pulseuser" );
-dr.rmdir ( pulseDir );
-}
 if ( xorg )
 {
 x2goDebug<<"Terminating the X.Org Server ...";
@@ -1522,7 +1504,20 @@ void ONMainWindow::closeClient()
 CloseHandle ( sshd.hProcess );
 CloseHandle ( sshd.hThread );
 }
-#else
+#endif /* defined (Q_OS_WIN) */
+
+#if defined (Q_OS_DARWIN) || defined (Q_OS_WIN)
+if (pulseManager) {
+delete (pulseManager);
+
+pulseManagerThread->quit ();
+pulseManagerThread->wait ();
+
+delete (pulseManagerThread);
+}
+#endif /* defined (Q_OS_DARWIN) || defined (Q_OS_WIN) */
+
+#ifndef (Q_OS_WIN)
 if ( userSshd && sshd )
 {
 x2goDebug<<"Terminating the OpenSSH server ...";
@@ -1530,8 +1525,8 @@ void ONMainWindow::closeClient()
 x2goDebug<<"Terminated the OpenSSH server.";
 delete sshd;
 }
+#endif /* !defined (Q_OS_WIN) */
 
-#endif
 if ( embedMode )
 {
 passForm->close();
@@ -2114,11 +2109,31 @@ void ONMainWindow::slotConfig()
 delete ld;
 ld=0;
 
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
+bool oldDisableInput = false;
+{
+X2goSettings st ("settings");
+oldDisableInput = st.setting ()->value ("pulse/norecord",
+(QVariant) false).toBool ();
+}
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
+
 ConfigDialog dlg ( this );
 if ( dlg.exec() ==QDialog::Accepted )
 {
 int i;
 
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
+X2goSettings st ("settings");
+bool newDisableInput = st.setting ()->value ("pulse/norecord",
+ (QVariant) false).toBool 
();
+
+if (oldDisableInput != newDisableInput) {
+pulseManager->set_record (!newDisableInput);
+pulseManager->restart ();
+}
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
+
 if ( 

[X2Go-Commits] [x2goclient] 142/217: src/pulsemanager.{cpp, h}: add get_pulse_dir () for fetching the (OS-dependent) PulseAudio config and cookie directory.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 3daf9376af09b0e5058d2a7c124117c9d07db6d9
Author: Mihai Moldovan 
Date:   Wed Apr 27 00:55:28 2016 +0200

src/pulsemanager.{cpp,h}: add get_pulse_dir () for fetching the 
(OS-dependent) PulseAudio config and cookie directory.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |4 
 src/pulsemanager.h   |1 +
 3 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da62c44..d6e52d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -270,6 +270,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: libpulsecore.dylib also resides in the "private" pulseaudio
   subdirectory now, adding it to "special files workaround".
 - pulsemanager.cpp: remove config.pa while doing post-exit cleanups.
+- src/pulsemanager.{cpp,h}: add get_pulse_dir () for fetching the
+  (OS-dependent) PulseAudio config and cookie directory.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 0d20ed1..4ac7ba5 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -579,6 +579,10 @@ bool PulseManager::get_playback () {
   return (playback_);
 }
 
+QDir PulseManager::get_pulse_dir () {
+  return (pulse_dir_);
+}
+
 bool PulseManager::set_pulse_port (std::uint16_t pulse_port) {
   bool ret = false;
 
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 6d94e34..af7ae77 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -53,6 +53,7 @@ class PulseManager: public QObject {
 std::uint16_t get_esd_port ();
 bool get_record ();
 bool get_playback ();
+QDir get_pulse_dir ();
 
 bool set_pulse_port (std::uint16_t pulse_port);
 bool set_esd_port (std::uint16_t esd_port);

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 144/217: src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ed550debb4217477ae16fc3c98c766c640475390
Author: Mihai Moldovan 
Date:   Wed Apr 27 01:39:02 2016 +0200

src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
---
 debian/changelog |1 +
 src/pulsemanager.cpp |   11 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cb0238..10d4f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -274,6 +274,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   (OS-dependent) PulseAudio config and cookie directory.
 - src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones
   depending on the detected PA version.
+- src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9f57525..03e321f 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -159,7 +159,9 @@ void PulseManager::start_osx () {
 + "/modules").absolutePath ()
<< "--high-priority";
 #ifdef DEBUG
-  server_args_ << "--log-level=debug";
+  server_args_ << "--log-level=debug"
+   << "--verbose"
+   << "--log-target=file:" pulse_dir_.absolutePath () + 
"/pulse.log";
 #endif // defined (DEBUG)
 
   if (generate_server_config () && generate_client_config ()) {
@@ -180,7 +182,10 @@ void PulseManager::start_win () {
   + QString::number 
(pulse_version_minor_)
   + 
"/modules/").absolutePath ());
 #ifdef DEBUG
-  server_args_ << "--log-level=debug";
+  /* FIXME: need a way to request debugging. */
+  server_args_ << "--log-level=debug"
+   << "--verbose"
+   << "--log-target=file:" + pulse_dir_.absolutePath () + 
"\\pulse.log";
 #endif // defined (DEBUG)
 
   if (generate_server_config () && generate_client_config ()) {
@@ -535,6 +540,8 @@ void PulseManager::on_pulse_finished (int exit_code) {
   // Remove server config file, otherwise the directory won't be empty.
   work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ 
"/config.pa").absolutePath ()));
+  work_dir.remove (QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+   + 
"/pulse.log").absolutePath ()));
 #else // Linux
   // FIXME.
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 147/217: src/configdialog.{cpp, h}: add "no record" support for OS X (through PulseManager.)

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit e570ed920abaee924910bd297a51c732d316698a
Author: Mihai Moldovan 
Date:   Fri Apr 29 02:00:42 2016 +0200

src/configdialog.{cpp,h}: add "no record" support for OS X (through 
PulseManager.)
---
 debian/changelog |2 ++
 src/configdialog.cpp |   31 ---
 src/configdialog.h   |4 ++--
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 189a09d..238504c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -277,6 +277,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
 - src/pulsemanager.cpp: backport fix for 526.
 - src/pulsemanager.cpp: backport fix for 422.
+- src/configdialog.{cpp,h}: add "no record" support for OS X (through
+  PulseManager.)
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 2f70a13..93c0225 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -352,18 +352,16 @@ ConfigDialog::ConfigDialog ( QWidget * parent,  
Qt::WindowFlags f )
 tabWidg->addTab(xsetWidg, tr("X.Org Server settings"));
 #endif
 
-#ifdef Q_OS_WIN
-QFrame* frp=new QFrame(this);
-tabWidg->addTab(frp, tr("Pulseaudio settings"));
-QVBoxLayout* l=new QVBoxLayout(frp);
-cbNoRecord=new QCheckBox(tr("Disable audio input"),frp);
-QLabel* lw=new QLabel(tr("You must restart the X2Go 
Client for the changes to take effect"),frp);
-lw->setWordWrap(true);
-l->addWidget(lw);
-l->addWidget(cbNoRecord);
-l->addStretch(1);
-cbNoRecord->setChecked ( st.setting()->value ( "pulse/norecord", false 
).toBool() );
-#endif
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
+QFrame* frp = new QFrame (this);
+tabWidg->addTab (frp, tr ("PulseAudio settings"));
+QVBoxLayout* l = new QVBoxLayout (frp);
+cbNoRecord = new QCheckBox (tr ("Disable sound input"), frp);
+lw->setWordWrap (true);
+l->addWidget (cbNoRecord);
+l->addStretch (1);
+cbNoRecord->setChecked (st.setting ()->value ("pulse/norecord", 
false).toBool ());
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
 }
 
 
@@ -381,9 +379,9 @@ void ConfigDialog::slot_accepted()
 st.setting()->setValue ( "trayicon/mincon", cbMinimizeTray->isChecked() );
 st.setting()->setValue ( "trayicon/maxdiscon", cbMaxmizeTray->isChecked() 
);
 #endif
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
 st.setting()->setValue ( "pulse/norecord", cbNoRecord->isChecked() );
-#endif
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
 #ifdef USELDAP
 if ( !embedMode )
 {
@@ -661,12 +659,15 @@ void ConfigDialog::slotDefaults()
  cbNoRecord->setChecked(false);
 }
 break;
-#endif
+#endif /* defined (Q_OS_WIN) */
 case 0:
 {
 if ( embedMode )
 cbStartEmbed->setChecked ( true );
 clientSshPort->setValue ( 22 );
+#ifdef Q_OS_DARWIN
+cbNoRecord->setChecked (false);
+#endif /* defined (Q_OS_DARWIN) */
 #ifndef CFGPLUGIN
 gbTrayIcon->setChecked (false);
 cbMinimizeTray->setChecked (false);
diff --git a/src/configdialog.h b/src/configdialog.h
index e9b6582..5b55454 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -93,9 +93,9 @@ private:
 XSettingsWidget* xsetWidg;
 #endif
 
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
 QCheckBox *cbNoRecord;
-#endif
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
 
 QGroupBox *gbTrayIcon;
 QCheckBox *cbMinimizeTray;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 143/217: src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones depending on the detected PA version.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit a757fd20f6ff17df81bac4689169837ca5658f32
Author: Mihai Moldovan 
Date:   Wed Apr 27 01:17:09 2016 +0200

src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones 
depending on the detected PA version.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   13 ++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6e52d3..3cb0238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -272,6 +272,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: remove config.pa while doing post-exit cleanups.
 - src/pulsemanager.{cpp,h}: add get_pulse_dir () for fetching the
   (OS-dependent) PulseAudio config and cookie directory.
+- src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones
+  depending on the detected PA version.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 4ac7ba5..9f57525 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -152,7 +152,11 @@ void PulseManager::start_osx () {
<< "-F" << pulse_dir_.absolutePath () + "/config.pa"
<< "-p"
<< QDir (app_dir_
-+ "/../Frameworks/pulse-2.0/modules").absolutePath ()
++ "/../Frameworks/pulse-"
++ QString::number (pulse_version_major_)
++ "."
++ QString::number (pulse_version_minor_)
++ "/modules").absolutePath ()
<< "--high-priority";
 #ifdef DEBUG
   server_args_ << "--log-level=debug";
@@ -170,8 +174,11 @@ void PulseManager::start_win () {
   server_args_ << "--exit-idle-time=-1" << "-n"
<< "-F" << QDir::toNativeSeparators (QDir 
(pulse_dir_.absolutePath ()
   + 
"/config.pa").absolutePath ())
-   << "-p" << QDir::toNativeSeparators (QDir (app_dir_ + 
"/pulse/lib/pulse-1.1/"
-  + 
"modules/").absolutePath ());
+   << "-p" << QDir::toNativeSeparators (QDir (app_dir_ + 
"/pulse/lib/pulse-"
+  + QString::number 
(pulse_version_major_)
+  + "."
+  + QString::number 
(pulse_version_minor_)
+  + 
"/modules/").absolutePath ());
 #ifdef DEBUG
   server_args_ << "--log-level=debug";
 #endif // defined (DEBUG)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 139/217: macbuild.sh: PulseAudio has been updated to version 8.0. Reflect this.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f76192e7fe41ba38a0178be37c6ac77471068ccf
Author: Mihai Moldovan 
Date:   Thu Mar 31 21:11:46 2016 +0200

macbuild.sh: PulseAudio has been updated to version 8.0. Reflect this.
---
 debian/changelog |1 +
 macbuild.sh  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 945be0d..16e1255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -266,6 +266,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: use record and playback member variables.
 - pulsemanager.cpp: cleanup, don't use copy assignment operator when we
   just need to construct a new object.
+- macbuild.sh: PulseAudio has been updated to version 8.0. Reflect this.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index c95955e..eb128c0 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -177,7 +177,7 @@ NXPROXY="nxproxy"
 PULSEAUDIO_BINARIES=( "pulseaudio" "esdcompat" "pacat" "pacmd"  "pactl"
   "pamon"  "paplay""parec" "parecord"   
"pasuspender" )
 PULSEAUDIO_LIBRARIES=( "libpulse-simple.0.dylib"
-   "pulse-6.0"
+   "pulse-8.0"
"pulseaudio" )
 
 typeset -a special_files_regex

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 136/217: pulsemanager.h: more moving around.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 09ad592c14e8197b6206c272ed961919f37348db
Author: Mihai Moldovan 
Date:   Thu Dec 31 02:11:16 2015 +0100

pulsemanager.h: more moving around.
---
 debian/changelog   |1 +
 src/pulsemanager.h |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f06abfb..2c5c7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -262,6 +262,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   as getters and setters.
 - pulsemanager.cpp: reorder member variables in initializer list.
 - pulsemanager.cpp: fix compile error in startup sound function.
+- pulsemanager.h: more moving around.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 57b80bd..6d94e34 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -102,11 +102,11 @@ class PulseManager: public QObject {
 QString app_dir_;
 QString pulse_X2Go_;
 QDir pulse_dir_;
-QStringList server_args_;
 QString server_binary_;
 QString server_working_dir_;
 
 QProcessEnvironment env_;
+QStringList server_args_;
 QProcess *pulse_server_;
 QProcess::ProcessState state_;
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 138/217: pulsemanager.cpp: cleanup, don't use copy assignment operator when we just need to construct a new object.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 7edd2dd7baa0d69b7bd049fb0102265bfd091733
Author: Mihai Moldovan 
Date:   Thu Dec 31 02:14:10 2015 +0100

pulsemanager.cpp: cleanup, don't use copy assignment operator when we just 
need to construct a new object.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   15 +++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 328def0..945be0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -264,6 +264,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: fix compile error in startup sound function.
 - pulsemanager.h: more moving around.
 - pulsemanager.cpp: use record and playback member variables.
+- pulsemanager.cpp: cleanup, don't use copy assignment operator when we
+  just need to construct a new object.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 25f8f50..9a70e5d 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -188,7 +188,7 @@ void PulseManager::start_linux () {
 }
 
 void PulseManager::fetch_pulseaudio_version () {
-  QStringList args = "--version";
+  QStringList args (QString ("--version"));
   QProcess tmp_server (this);
 
   /* Start PA with --version argument. */
@@ -198,7 +198,7 @@ void PulseManager::fetch_pulseaudio_version () {
   /* Wait until the process exited again. */
   if (tmp_server.waitForFinished ()) {
 /* Read stdout and split it up on newlines. */
-QByteArray ba = pulse_server_->readAllStandardOutput ();
+QByteArray ba (pulse_server_->readAllStandardOutput ());
 QString stdout_data (ba.data ());
 QStringList stdout_list (stdout_data.split ("\n"));
 
@@ -364,7 +364,7 @@ bool PulseManager::find_port (bool search_esd) {
 }
 
 bool PulseManager::generate_server_config () {
-  QString config_file_name = pulse_dir_.absolutePath () + "/config.pa";
+  QString config_file_name (pulse_dir_.absolutePath () + "/config.pa");
   QTemporaryFile config_tmp_file (pulse_dir_.absolutePath () + 
"/tmp/tmpconfig");
   bool ret = false;
 
@@ -482,8 +482,8 @@ void PulseManager::create_client_dir () {
 void PulseManager::slot_play_startup_sound () {
 #ifdef DEBUG
   QProcess play_file (0);
-  QString play_file_binary = QString (app_dir_);
-  QString play_file_file = play_file_binary;
+  QString play_file_binary (app_dir_);
+  QString play_file_file (play_file_binary);
 
 #ifdef Q_OS_DARWIN
   play_file_binary += "/../exe/paplay";
@@ -493,8 +493,7 @@ void PulseManager::slot_play_startup_sound () {
   playFileFile += "/startup.wav";
 #endif // defined (Q_OS_DARWIN)
 
-  QStringList args;
-  args << play_file_file;
+  QStringList args (play_file_file);
   play_file.setWorkingDirectory (server_working_dir_);
   play_file.setProcessEnvironment (env_);
   play_file.start (play_file_binary, args);
@@ -508,7 +507,7 @@ void PulseManager::on_pulse_finished (int exit_code) {
   if (!exit_code)
 x2goDebug << "Warning! Pulseaudio's exit code is non-zero.";
 
-  QByteArray ba = pulse_server_->readAllStandardOutput ();
+  QByteArray ba (pulse_server_->readAllStandardOutput ());
   char *data = ba.data ();
   std::cout << data;
   ba = pulse_server_->readAllStandardError ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 133/217: pulsemanager.{cpp, h}: add record and playback private members, as well as getters and setters.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 4d69257306c56b8b5a51abf493d49c2ee83de325
Author: Mihai Moldovan 
Date:   Thu Dec 31 01:03:00 2015 +0100

pulsemanager.{cpp,h}: add record and playback private members, as well as 
getters and setters.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   34 +-
 src/pulsemanager.h   |7 +++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7beaaa1..b39a658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -258,6 +258,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   number.
 - pulsemanager.{cpp,h}: only allow changing PA or ESD ports when server is
   not currently running.
+- pulsemanager.{cpp,h}: add record and playback private members, as well
+  as getters and setters.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 7ffdfcf..ea8124e 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -39,7 +39,9 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
 pulse_version_major_ (0),
 pulse_version_minor_ (0),
 pulse_version_micro_ (0),
-pulse_version_misc_ ("") {
+pulse_version_misc_ (""),
+record_ (true),
+playback_ (true) {
   pulse_dir_ = QDir (QDir::homePath ());
   pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
   pulse_dir_.cd (pulse_X2Go_.mid (1));
@@ -554,6 +556,14 @@ std::uint16_t PulseManager::get_esd_port () {
   return (esd_port_);
 }
 
+bool PulseManager::get_record () {
+  return (record_);
+}
+
+bool PulseManager::get_playback () {
+  return (playback_);
+}
+
 bool PulseManager::set_pulse_port (std::uint16_t pulse_port) {
   bool ret = false;
 
@@ -576,6 +586,28 @@ bool PulseManager::set_esd_port (std::uint16_t esd_port) {
   return (ret);
 }
 
+bool PulseManager::set_record (bool record) {
+  bool ret = false;
+
+  if (!(is_server_running ())) {
+record_ = record;
+ret = true;
+  }
+
+  return (ret);
+}
+
+bool PulseManager::set_playback (bool playback) {
+  bool ret = false;
+
+  if (!(is_server_running ())) {
+playback_ = playback;
+ret = true;
+  }
+
+  return (ret);
+}
+
 void PulseManager::restart () {
   if (pulse_server_ && is_server_running ())
 shutdown ();
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 3dbd94f..57b80bd 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -51,9 +51,13 @@ class PulseManager: public QObject {
 
 std::uint16_t get_pulse_port ();
 std::uint16_t get_esd_port ();
+bool get_record ();
+bool get_playback ();
 
 bool set_pulse_port (std::uint16_t pulse_port);
 bool set_esd_port (std::uint16_t esd_port);
+bool set_record (bool record);
+bool set_playback (bool playback);
 
 
   public slots:
@@ -113,6 +117,9 @@ class PulseManager: public QObject {
 std::uint32_t pulse_version_minor_;
 std::uint32_t pulse_version_micro_;
 QString pulse_version_misc_;
+
+bool record_;
+bool playback_;
 };
 
 #ifdef NDEBUG_DEFINE

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 129/217: pulsemanager.{cpp, h}: some older PA versions used the major, minor and micro numbering scheme together with a descriptive string.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit c11fc04e72c775c3feb69b23a13ecded0b7da8cc
Author: Mihai Moldovan 
Date:   Wed Dec 30 23:11:44 2015 +0100

pulsemanager.{cpp,h}: some older PA versions used the major, minor and 
micro numbering scheme together with a descriptive string.

Add new member variables for this and initialize them correctly.
---
 debian/changelog |3 +++
 src/pulsemanager.cpp |4 +++-
 src/pulsemanager.h   |2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 45c9050..efe5f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -249,6 +249,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   CWD on Linux.
 - pulsemanager.cpp: fix some error messages by removing redundant
   newlines.
+- pulsemanager.{cpp,h}: some older PA versions used the major, minor and
+  micro numbering scheme together with a descriptive string. Add new
+  member variables for this and initialize them correctly.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 3f7256a..bdf7f62 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -37,7 +37,9 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
 server_binary_ (QString ("")),
 server_working_dir_ (QString ("")),
 pulse_version_major_ (0),
-pulse_version_minor_ (0) {
+pulse_version_minor_ (0),
+pulse_version_micro_ (0),
+pulse_version_misc_ ("") {
   pulse_dir_ = QDir (QDir::homePath ());
   pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
   pulse_dir_.cd (pulse_X2Go_.mid (1));
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index fb21992..52c4dfa 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -93,6 +93,8 @@ class PulseManager: public QObject {
 QString server_working_dir_;
 std::uint32_t pulse_version_major_;
 std::uint32_t pulse_version_minor_;
+std::uint32_t pulse_version_micro_;
+QString pulse_version_misc_;
 };
 
 #ifdef NDEBUG_DEFINE

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 122/217: pulsemanager.cpp: another typo fix: findPort -> find_port.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 502184614d4a27d4611a1048364629ac8454aa0b
Author: Mihai Moldovan 
Date:   Mon Nov 30 04:51:12 2015 +0100

pulsemanager.cpp: another typo fix: findPort -> find_port.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f32e962..c056356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -236,6 +236,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   or port variable to search_port.
 - pulsemanager.cpp: fix another compile error due to typo'd versions of
   generate_server_config () and generate_client_config ().
+- pulsemanager.cpp: another typo fix: findPort -> find_port.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ecf47a3..b4f8481 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -69,7 +69,7 @@ void PulseManager::start () {
   // failed. Better trust your compiler to
   // optimize this statement and save some
   // cycles.
-  if ((findPort (false)) && (findPort (true))) {
+  if ((find_port (false)) && (find_port (true))) {
 #ifdef Q_OS_DARWIN
 start_osx ();
 #elif defined (Q_OS_WIN)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 124/217: pulsemanager.cpp: add "dummy" start_linux () function.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fd9f8e85be00515d52c23cc9b44a2502895a6bbd
Author: Mihai Moldovan 
Date:   Mon Nov 30 04:53:38 2015 +0100

pulsemanager.cpp: add "dummy" start_linux () function.
---
 debian/changelog |3 ++-
 src/pulsemanager.cpp |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d85e102..78a2d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -237,8 +237,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: fix another compile error due to typo'd versions of
   generate_server_config () and generate_client_config ().
 - pulsemanager.cpp: another typo fix: findPort -> find_port.
-- pulsemanager.cpp: reorder member varibles in initialization list.
+- pulsemanager.cpp: reorder member variables in initialization list.
   Compile warning fix.
+- pulsemanager.cpp: add "dummy" start_linux () function.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 3d01cde..9c6de0d 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -142,6 +142,10 @@ void PulseManager::start_win () {
   }
 }
 
+void PulseManager::start_linux () {
+  /* Do nothing - assumed to be already running. */
+}
+
 bool PulseManager::find_port (bool search_esd) {
   QTcpSocket tcpSocket (0);
   bool free = false;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 116/217: pulsemanager.cpp: make startup sound playing via slot_play_startup_sound () Windows-compatible.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fd8198f598ad81bba93072a777ee223aaf1958ff
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:47:37 2015 +0100

pulsemanager.cpp: make startup sound playing via slot_play_startup_sound () 
Windows-compatible.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   17 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ed3851..8f806f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -227,6 +227,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: make generate_server_config () Windows-compatible.
 - pulsemanager.cpp: make generate_client_config () Windows-compatible.
 - pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
+- pulsemanager.cpp: make startup sound playing via
+  slot_play_startup_sound () Windows-compatible.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 421e54b..512b027 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -294,11 +294,22 @@ void PulseManager::create_client_dir () {
 void PulseManager::slot_play_startup_sound () {
 #ifdef DEBUG
   QProcess play_file (0);
+  QString play_file_binary = QString (app_dir_);
+  QString play_file_file = play_file_binary;
 
-  play_file.setWorkingDirectory (pulse_server_->workingDirectory ());
+#ifdef Q_OS_DARWIN
+  play_file_binary += "/../exe/paplay";
+  play_file_file += "/../Resources/startup.wav";
+#elif defined (Q_OS_WIN)
+  playFileBinary += "/pulse/paplay.exe";
+  playFileFile += "/startup.wav";
+#endif // defined (Q_OS_DARWIN)
+
+  QStringList args;
+  args << play_file_file;
+  play_file.setWorkingDirectory (server_working_dir_);
   play_file.setProcessEnvironment (env_);
-  play_file.start (app_dir_ + "/../exe/paplay "
-   + app_dir_ + "/../Resources/startup.wav");
+  play_file.start (play_file_binary, args);
 
   if (play_file.waitForStarted ())
 play_file.waitForFinished ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 121/217: pulsemanager.cpp: fix another compile error due to typo'd versions of generate_server_config () and generate_client_config ().

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f357c0a68465dc38696852d8eb4fabe55ba2cb80
Author: Mihai Moldovan 
Date:   Mon Nov 30 04:49:35 2015 +0100

pulsemanager.cpp: fix another compile error due to typo'd versions of 
generate_server_config () and generate_client_config ().
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9211be0..f32e962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -234,6 +234,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   declaration accordingly.
 - pulsemanager.cpp: fix compile errors in find_port () by renaming the ret
   or port variable to search_port.
+- pulsemanager.cpp: fix another compile error due to typo'd versions of
+  generate_server_config () and generate_client_config ().
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 7b0fa65..ecf47a3 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -135,7 +135,7 @@ void PulseManager::start_win () {
   server_working_dir_ = QString (app_dir_ + "/pulse/");
   server_binary_ = QString (app_dir_ + "/pulse/pulseaudio.exe");
 
-  if (generateServerConfig () && generateClientConfig ()) {
+  if (generate_server_config () && generate_client_config ()) {
 create_client_dir ();
 
 start_generic ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 119/217: pulsemanager.{cpp, h}: find_port () actually returns a value, fix declaration accordingly.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 38b0fc9a5ff41e7bf3e83afecd2fbe85da7a48df
Author: Mihai Moldovan 
Date:   Mon Nov 30 04:39:33 2015 +0100

pulsemanager.{cpp,h}: find_port () actually returns a value, fix 
declaration accordingly.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |2 +-
 src/pulsemanager.h   |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0af2e29..4d99a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -230,6 +230,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: make startup sound playing via
   slot_play_startup_sound () Windows-compatible.
 - pulsemanager.cpp: typo fix in variable name server_working_dir_.
+- pulsemanager.{cpp,h}: find_port () actually returns a value, fix
+  declaration accordingly.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 7dda3d2..ae8ece9 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -142,7 +142,7 @@ void PulseManager::start_win () {
   }
 }
 
-void PulseManager::find_port (bool search_esd) {
+bool PulseManager::find_port (bool search_esd) {
   QTcpSocket tcpSocket (0);
   bool free = false;
   std::uint16_t ret = pulse_port_;
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index a42f1ca..e1a088a 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -63,7 +63,7 @@ class PulseManager: public QObject {
 // FIXME
 void start_linux ();
 void start_generic ();
-void find_port (bool search_esd = false);
+bool find_port (bool search_esd = false);
 bool generate_server_config ();
 bool generate_client_config ();
 void cleanup_client_dir ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 115/217: pulsemanager.cpp: only play startup sound if DEBUG macro is defined.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit dc1ec7c3885b068b8beae37f5e96fd184d1336d1
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:45:49 2015 +0100

pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c06670b..4ed3851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -226,6 +226,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: also load module-esound-protocol-tcp module.
 - pulsemanager.cpp: make generate_server_config () Windows-compatible.
 - pulsemanager.cpp: make generate_client_config () Windows-compatible.
+- pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 5e66e44..421e54b 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -292,6 +292,7 @@ void PulseManager::create_client_dir () {
 }
 
 void PulseManager::slot_play_startup_sound () {
+#ifdef DEBUG
   QProcess play_file (0);
 
   play_file.setWorkingDirectory (pulse_server_->workingDirectory ());
@@ -301,6 +302,7 @@ void PulseManager::slot_play_startup_sound () {
 
   if (play_file.waitForStarted ())
 play_file.waitForFinished ();
+#endif // defined (DEBUG)
 }
 
 void PulseManager::on_pulse_finished (int exit_code) {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 118/217: pulsemanager.cpp: typo fix in member variable name server_working_dir_.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ade3ff8f6923cfd3db732748edfdfaab8f3bc737
Author: Mihai Moldovan 
Date:   Mon Nov 30 04:35:57 2015 +0100

pulsemanager.cpp: typo fix in member variable name server_working_dir_.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8f806f8..0af2e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -229,6 +229,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
 - pulsemanager.cpp: make startup sound playing via
   slot_play_startup_sound () Windows-compatible.
+- pulsemanager.cpp: typo fix in variable name server_working_dir_.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 512b027..7dda3d2 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -32,7 +32,7 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
 app_dir_ (QApplication::applicationDirPath ()),
 server_args_ (QStringList ()),
 server_binary_ (QString ("")),
-server_working_dir (QString ("")),
+server_working_dir_ (QString ("")),
 pulse_version_major_ (0),
 pulse_version_minor_ (0) {
   pulse_dir_ = QDir (QDir::homePath ());

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 114/217: pulsemanager.cpp: make generate_client_config () Windows-compatible.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 9f47f5920ddf32cb83ebdbe926eb9243721f5911
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:44:53 2015 +0100

pulsemanager.cpp: make generate_client_config () Windows-compatible.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |   12 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 940d6ed..c06670b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -225,6 +225,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   functionality.
 - pulsemanager.cpp: also load module-esound-protocol-tcp module.
 - pulsemanager.cpp: make generate_server_config () Windows-compatible.
+- pulsemanager.cpp: make generate_client_config () Windows-compatible.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 3704000..5e66e44 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -236,21 +236,27 @@ bool PulseManager::generate_server_config () {
 bool PulseManager::generate_client_config () {
   QTemporaryFile client_config_tmp_file (pulse_dir_.absolutePath ()
  + "/tmp/tmpconfig");
-  QString client_config_file_name (pulse_dir_.absolutePath () + 
"/.pulse/client.conf");
+  QString client_config_file_name (pulse_dir_.absolutePath ()
+   + "/.pulse/client.conf");
   bool ret = false;
 
   if (client_config_tmp_file.open ()) {
 QTextStream config_tmp_file_stream (_config_tmp_file);
 
 config_tmp_file_stream << "autospawn=no" << endl;
+#ifdef Q_OS_WIN
+config_tmp_file_stream << "default-server=localhost:" << pulse_port_ << 
endl;
+#endif // defined (Q_OS_WIN)
 config_tmp_file_stream << "daemon-binary="
-   << QDir (app_dir_
-+ "/../exe/pulseaudio").absolutePath ()
+   << QDir::toNativeSeparators (QDir 
(server_binary_).absolutePath ())
<< endl;
 
 if (QFile::exists (client_config_file_name))
   QFile::remove (client_config_file_name);
 
+QDir client_config_dir (pulse_dir_.absolutePath () + "/.pulse/");
+client_config_dir.mkpath (client_config_dir.absolutePath ());
+
 client_config_tmp_file.copy (client_config_file_name);
 client_config_tmp_file.remove ();
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 117/217: pulsemanager.h: whitespace only.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit e0d607a78c3f3226a052754f3b138cbba5ea7fe3
Author: Mihai Moldovan 
Date:   Mon Nov 30 04:35:23 2015 +0100

pulsemanager.h: whitespace only.
---
 src/pulsemanager.h |1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 8463fb5..a42f1ca 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+
 #include "x2gologdebug.h"
 #include "x2gosettings.h"
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 113/217: pulsemanager.cpp: make generate_server_config () Windows-compatible.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 88dae8a5af5b095c682fbdd52e43ebad9c8626eb
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:44:07 2015 +0100

pulsemanager.cpp: make generate_server_config () Windows-compatible.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |8 
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index df9ab0e..940d6ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -224,6 +224,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.{cpp,h}: implement start_win () as part of Windows
   functionality.
 - pulsemanager.cpp: also load module-esound-protocol-tcp module.
+- pulsemanager.cpp: make generate_server_config () Windows-compatible.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index d705486..3704000 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -198,14 +198,22 @@ bool PulseManager::generate_server_config () {
 
 config_tmp_file_stream << "load-module module-native-protocol-tcp port="
 + QString::number (pulse_port_) << endl;
+
+#ifdef Q_OS_UNIX
 config_tmp_file_stream << "load-module module-native-protocol-unix" << 
endl;
 config_tmp_file_stream << "load-module module-esound-protocol-unix" << 
endl;
+#endif // defined(Q_OS_UNIX)
 
 config_tmp_file_stream << "load-module module-esound-protocol-tcp port="
<< QString::number (esd_port_)
<< endl;
 
+#ifdef Q_OS_DARWIN
 config_tmp_file_stream << "load-module module-coreaudio-detect";
+#elif defined (Q_OS_WIN)
+config_tmp_file_stream << "load-module module-waveout";
+// FIXME Linux
+#endif // defined (Q_OS_DARWIN)
 
 if (disable_input)
   config_tmp_file_stream << " record=0";

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 109/217: pulsemanager.{cpp, h}: add new function start_generic () to split off common functionality.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 39d004a2190db4347d9ced0b03696bbbe5aa1324
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:31:00 2015 +0100

pulsemanager.{cpp,h}: add new function start_generic () to split off common 
functionality.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   19 +++
 src/pulsemanager.h   |1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 804a0ef..bd72eb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -218,6 +218,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.cpp: add Windows support to shutdown ().
 - pulsemanager.cpp: add cleanup support to on_pulse_finished ().
 - pulsemanager.cpp: add Windows stuff to initial env in constructor.
+- pulsemanager.{cpp,h}: add new function start_generic () to split off
+  common functionality.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 8bb901e..6a3e9d8 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -80,6 +80,25 @@ void PulseManager::start () {
   }
 }
 
+void PulseManager::start_generic () {
+  pulse_server_->setProcessEnvironment (env_);
+  pulse_server_->setWorkingDirectory (server_working_dir_);
+
+  pulse_server_->start (server_binary_, server_args_);
+  if (pulse_server_->waitForStarted ()) {
+x2goDebug << "pulse started with arguments" << server_args_ << "; waiting 
for finish...";
+state_ = QProcess::Running;
+
+connect (pulse_server_, SIGNAL (finished (int)),
+ this,  SLOT (slot_on_pulse_finished (int)));
+
+#ifdef DEBUG
+// Give PA a little time to come up.
+QTimer::singleShot (3000, this, SLOT (slot_play_startup_sound ()));
+#endif // defined (DEBUG)
+  }
+}
+
 void PulseManager::start_osx () {
   if (generate_server_config () && generate_client_config ()) {
 cleanup_client_dir ();
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index e5f4b87..be94414 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -62,6 +62,7 @@ class PulseManager: public QObject {
 void start_win ();
 // FIXME
 void start_linux ();
+void start_generic ();
 void find_port (bool search_esd = false);
 bool generate_server_config ();
 bool generate_client_config ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 111/217: pulsemanager.{cpp, h}: implement start_win () as part of Windows functionality.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit a9ffc647b18fffe18a83b7e41dcadb376e21e02a
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:39:43 2015 +0100

pulsemanager.{cpp,h}: implement start_win () as part of Windows 
functionality.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   21 +
 src/pulsemanager.h   |1 -
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cdc5ca5..a30231e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -221,6 +221,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.{cpp,h}: add new function start_generic () to split off
   common functionality.
 - pulsemanager.cpp: let start_osx () use start_generic ().
+- pulsemanager.{cpp,h}: implement start_win () as part of Windows
+  functionality.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1041797..a4419db 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -121,6 +121,27 @@ void PulseManager::start_osx () {
   }
 }
 
+void PulseManager::start_win () {
+  server_args_ = QStringList ();
+  server_args_ << "--exit-idle-time=-1" << "-n"
+   << "-F" << QDir::toNativeSeparators (QDir 
(pulse_dir_.absolutePath ()
+  + 
"/config.pa").absolutePath ())
+   << "-p" << QDir::toNativeSeparators (QDir (app_dir_ + 
"/pulse/lib/pulse-1.1/"
+  + 
"modules/").absolutePath ());
+#ifdef DEBUG
+  server_args_ << "--log-level=debug";
+#endif // defined (DEBUG)
+
+  server_working_dir_ = QString (app_dir_ + "/pulse/");
+  server_binary_ = QString (app_dir_ + "/pulse/pulseaudio.exe");
+
+  if (generateServerConfig () && generateClientConfig ()) {
+create_client_dir ();
+
+start_generic ();
+  }
+}
+
 void PulseManager::find_port (bool search_esd) {
   QTcpSocket tcpSocket (0);
   bool free = false;
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index be94414..8463fb5 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -58,7 +58,6 @@ class PulseManager: public QObject {
   private:
 PulseManager (const PulseManager );
 void start_osx ();
-// FIXME
 void start_win ();
 // FIXME
 void start_linux ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 104/217: pulsemanager.cpp: make start () wrap the "real" OS-specific start functions.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 3843e3728b2ba6efe616b2413d367e25c1d7548e
Author: Mihai Moldovan 
Date:   Fri Oct 30 03:03:44 2015 +0100

pulsemanager.cpp: make start () wrap the "real" OS-specific start functions.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   20 +---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8105abd..232b1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -212,6 +212,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.{cpp,h}: fixup preprocessor usage.
 - pulsemanager.{cpp,h}: add server_args_, server_binary_ and
   server_working_dir_ class variables.
+- pulsemanager.cpp: make start () wrap the "real" OS-specific start
+  functions.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index a46ab11..f094019 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -59,16 +59,6 @@ void PulseManager::start () {
   pulse_server_ = new QProcess (0);
   state_ = QProcess::Starting;
 
-#ifdef Q_OS_DARWIN
-  start_osx ();
-#elif defined (Q_OS_WIN)
-  start_win ();
-#elif defined (Q_OS_LINUX)
-  start_linux ();
-#endif // defined (Q_OS_DARWIN)
-}
-
-void PulseManager::start_osx () {
   // Search for a free Pulse and EsounD port.
   // Note that there is no way we could find
   // an esd port, if the pulse port detection
@@ -76,9 +66,17 @@ void PulseManager::start_osx () {
   // optimize this statement and save some
   // cycles.
   if ((findPort (false)) && (findPort (true))) {
-find_port ();
+#ifdef Q_OS_DARWIN
+start_osx ();
+#elif defined (Q_OS_WIN)
+start_win ();
+#elif defined (Q_OS_LINUX)
+start_linux ();
+#endif // defined (Q_OS_DARWIN)
   }
+}
 
+void PulseManager::start_osx () {
   if (generate_server_config () && generate_client_config ()) {
 cleanup_client_dir ();
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 103/217: pulsemanager.{cpp, h}: add server_args_, server_binary_ and server_working_dir_ class variables.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b0aefa63e2d374b8c70ba71c446e6a36cd0b5822
Author: Mihai Moldovan 
Date:   Fri Oct 30 02:56:30 2015 +0100

pulsemanager.{cpp,h}: add server_args_, server_binary_ and 
server_working_dir_ class variables.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |3 +++
 src/pulsemanager.h   |3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c50a89f..8105abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -210,6 +210,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.{cpp,h}: rename relaunch () to restart ().
 - pulsemanager.cpp: reformat only.
 - pulsemanager.{cpp,h}: fixup preprocessor usage.
+- pulsemanager.{cpp,h}: add server_args_, server_binary_ and
+  server_working_dir_ class variables.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9c31cca..a46ab11 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -30,6 +30,9 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
 state_ (QProcess::NotRunning),
 pulse_server_ (NULL),
 app_dir_ (QApplication::applicationDirPath ()),
+server_args_ (QStringList ()),
+server_binary_ (QString ("")),
+server_working_dir (QString ("")),
 pulse_version_major_ (0),
 pulse_version_minor_ (0) {
   pulse_dir_ = QDir (QDir::homePath ());
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 020556a..99b3d4a 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -85,6 +85,9 @@ class PulseManager: public QObject {
 std::uint16_t esd_port_;
 QProcess::ProcessState state_;
 QString app_dir_;
+QStringList server_args_;
+QString server_binary_;
+QString server_working_dir_;
 std::uint32_t pulse_version_major_;
 std::uint32_t pulse_version_minor_;
 };

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 102/217: pulsemanager.{cpp, h}: fixup preprocessor usage.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 268eddea2d7e2aa193ea9998752c13188138812d
Author: Mihai Moldovan 
Date:   Fri Oct 30 02:40:58 2015 +0100

pulsemanager.{cpp,h}: fixup preprocessor usage.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |8 
 src/pulsemanager.h   |4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f19b39..c50a89f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -209,6 +209,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.{cpp,h}: add ESD support.
 - pulsemanager.{cpp,h}: rename relaunch () to restart ().
 - pulsemanager.cpp: reformat only.
+- pulsemanager.{cpp,h}: fixup preprocessor usage.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index d9d5710..9c31cca 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -22,7 +22,7 @@
 #ifndef DEBUG
 #define DEBUG_UNDEF
 #define DEBUG
-#endif
+#endif // defined (NDEBUG)
 
 PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
 pulse_port_ (4713),
@@ -62,7 +62,7 @@ void PulseManager::start () {
   start_win ();
 #elif defined (Q_OS_LINUX)
   start_linux ();
-#endif
+#endif // defined (Q_OS_DARWIN)
 }
 
 void PulseManager::start_osx () {
@@ -105,7 +105,7 @@ void PulseManager::start_osx () {
 #ifdef DEBUG
   // Give PA a little time to come up.
   QTimer::singleShot (5000, this, SLOT (slot_play_startup_sound ()));
-#endif
+#endif // defined (DEBUG)
 }
   }
 }
@@ -305,4 +305,4 @@ QProcess::ProcessState PulseManager::state () {
 #ifdef DEBUG_UNDEF
 #undef DEBUG
 #undef DEBUG_UNDEF
-#endif
+#endif // defined (DEBUG_UNDEF)
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index aae71e3..020556a 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -23,7 +23,7 @@
 #ifdef NDEBUG
 #define NDEBUG_DEFINE
 #undef NDEBUG
-#endif
+#endif // defined (NDEBUG)
 
 #include 
 #include 
@@ -92,6 +92,6 @@ class PulseManager: public QObject {
 #ifdef NDEBUG_DEFINE
 #define NDEBUG
 #undef NDEBUG_DEFINE
-#endif
+#endif // defined (NDEBUG_DEFINE)
 
 #endif // PULSEMANAGER_H

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 91/217: pulsemanager.{cpp, h}: use name and underscore for member variables, not underscore and name.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 7adefb561f82cfbee9a58d9dd34c7b721968933e
Author: Mihai Moldovan 
Date:   Thu Oct 1 01:57:48 2015 +0200

pulsemanager.{cpp,h}: use name and underscore for member variables, not 
underscore and name.
---
 debian/changelog |2 ++
 src/pulsemanager.cpp |   94 +-
 src/pulsemanager.h   |   14 
 3 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e5ed57..2656e69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -196,6 +196,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: rewrite ID line detection algorithm. Modules don't seem to
   be needing one, so skipping the first dependency line incidentally skips
   a "real" dependency for modules.
+- pulsemanager.{cpp,h}: use name and underscore for member variables, not
+  underscore and name.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index af1ba2b..5c38dd6 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -25,39 +25,39 @@
 #endif
 
 PulseManager::PulseManager () {
-_pulse_X2Go = "/.x2go/pulse";
+pulse_X2Go_ = "/.x2go/pulse";
 
-_pulse_dir = QDir (QDir::homePath ());
-_pulse_dir.mkpath (_pulse_dir.absolutePath () + _pulse_X2Go + "/tmp");
-_pulse_dir.cd (_pulse_X2Go.mid (1));
+pulse_dir_ = QDir (QDir::homePath ());
+pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
+pulse_dir_.cd (pulse_X2Go_.mid (1));
 
-_env = QProcessEnvironment::systemEnvironment ();
-_env.insert ("HOME", _pulse_dir.absolutePath ());
-_env.insert ("TEMP", _pulse_dir.absolutePath () + "/tmp");
+env_ = QProcessEnvironment::systemEnvironment ();
+env_.insert ("HOME", pulse_dir_.absolutePath ());
+env_.insert ("TEMP", pulse_dir_.absolutePath () + "/tmp");
 
-_pulse_port = 4713;
+pulse_port_ = 4713;
 
-_state = QProcess::NotRunning;
+state_ = QProcess::NotRunning;
 
-_pulse_server = 0;
+pulse_server_ = 0;
 
-_app_dir = QApplication::applicationDirPath ();
+app_dir_ = QApplication::applicationDirPath ();
 }
 
 PulseManager::~PulseManager () {
-if (_pulse_server && is_server_running ())
+if (pulse_server_ && is_server_running ())
 shutdown ();
 
-delete (_pulse_server);
+delete (pulse_server_);
 }
 
 void PulseManager::start () {
 assert (!is_server_running ());
 
-delete (_pulse_server);
+delete (pulse_server_);
 
-_pulse_server = new QProcess (0);
-_state = QProcess::Starting;
+pulse_server_ = new QProcess (0);
+state_ = QProcess::Starting;
 
 #ifdef Q_OS_DARWIN
 start_osx ();
@@ -74,27 +74,27 @@ void PulseManager::start_osx () {
 if (generate_server_config () && generate_client_config ()) {
 cleanup_client_dir ();
 
-_pulse_server->setProcessEnvironment (_env);
+pulse_server_->setProcessEnvironment (env_);
 
 QStringList args;
 args << "--exit-idle-time=-1" << "-n"
- << "-F" << _pulse_dir.absolutePath () + "/config.pa"
+ << "-F" << pulse_dir_.absolutePath () + "/config.pa"
  << "-p"
- << QDir (_app_dir
+ << QDir (app_dir_
   + "/../Frameworks/pulse-2.0/modules").absolutePath ()
  << "--high-priority";
 #ifdef DEBUG
 args << "--log-level=debug";
 #endif
 
-_pulse_server->setWorkingDirectory (_app_dir + "/../exe/");
-_pulse_server->start (_app_dir + "/../exe/pulseaudio", args);
+pulse_server_->setWorkingDirectory (app_dir_ + "/../exe/");
+pulse_server_->start (app_dir_ + "/../exe/pulseaudio", args);
 
-if (_pulse_server->waitForStarted ()) {
+if (pulse_server_->waitForStarted ()) {
 x2goDebug << "pulse started with" << args << "waiting for 
finish...";
-_state = QProcess::Running;
+state_ = QProcess::Running;
 
-connect (_pulse_server, SIGNAL (finished (int)),
+connect (pulse_server_, SIGNAL (finished (int)),
  this,  SLOT (on_pulse_finished (int)));
 
 #ifdef DEBUG
@@ -110,12 +110,12 @@ void PulseManager::find_port () {
 bool free = false;
 
 do {
-tcpSocket.connectToHost ("127.0.0.1", _pulse_port);
+tcpSocket.connectToHost ("127.0.0.1", pulse_port_);
 
 if (tcpSocket.waitForConnected (1000)) {
 tcpSocket.close ();
 free = false;
-_pulse_port++;
+pulse_port_++;
 }
 else
 free = true;
@@ -123,8 +123,8 @@ void PulseManager::find_port () {

[X2Go-Commits] [x2goclient] 94/217: pulsemanager.cpp: use initializer list for constructor.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5a7b3a13ba43b575ed52836f31105787715c2ef7
Author: Mihai Moldovan 
Date:   Thu Oct 1 01:49:47 2015 +0200

pulsemanager.cpp: use initializer list for constructor.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |   14 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a003b82..6b2633f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -200,6 +200,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   underscore and name.
 - pulsemanager.cpp: minor non-behavior changing fixes.
 - pulsemanager.{cpp,h}: reformat only.
+- pulsemanager.cpp: use initializer list for constructor.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9e70ce6..002c9f8 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -24,9 +24,9 @@
 #define DEBUG
 #endif
 
-PulseManager::PulseManager () {
-  pulse_X2Go_ = "/.x2go/pulse";
-
+PulseManager::PulseManager () : pulse_X2Go_("/.x2go/pulse"), pulse_port_(4713),
+state_(QProcess::NotRunning), 
pulse_server_(NULL),
+app_dir_(QApplication::applicationDirPath ()) {
   pulse_dir_ = QDir (QDir::homePath ());
   pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
   pulse_dir_.cd (pulse_X2Go_.mid (1));
@@ -34,14 +34,6 @@ PulseManager::PulseManager () {
   env_ = QProcessEnvironment::systemEnvironment ();
   env_.insert ("HOME", pulse_dir_.absolutePath ());
   env_.insert ("TEMP", pulse_dir_.absolutePath () + "/tmp");
-
-  pulse_port_ = 4713;
-
-  state_ = QProcess::NotRunning;
-
-  pulse_server_ = NULL;
-
-  app_dir_ = QApplication::applicationDirPath ();
 }
 
 PulseManager::~PulseManager () {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 92/217: pulsemanager.cpp: minor non-behavior changing fixes.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b0165cac50b8db726760ebcc382353c7f95f2d93
Author: Mihai Moldovan 
Date:   Thu Oct 1 01:58:54 2015 +0200

pulsemanager.cpp: minor non-behavior changing fixes.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2656e69..9c5cd69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -198,6 +198,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   a "real" dependency for modules.
 - pulsemanager.{cpp,h}: use name and underscore for member variables, not
   underscore and name.
+- pulsemanager.cpp: minor non-behavior changing fixes.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 5c38dd6..ecf442e 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -39,7 +39,7 @@ PulseManager::PulseManager () {
 
 state_ = QProcess::NotRunning;
 
-pulse_server_ = 0;
+pulse_server_ = NULL;
 
 app_dir_ = QApplication::applicationDirPath ();
 }
@@ -115,7 +115,7 @@ void PulseManager::find_port () {
 if (tcpSocket.waitForConnected (1000)) {
 tcpSocket.close ();
 free = false;
-pulse_port_++;
+++pulse_port_;
 }
 else
 free = true;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 96/217: pulsemanager.cpp: reformat only.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 0dea841bb00e9dc58e7fd715ad4c3533724367d9
Author: Mihai Moldovan 
Date:   Thu Oct 29 04:17:47 2015 +0100

pulsemanager.cpp: reformat only.
---
 debian/changelog |1 +
 src/pulsemanager.cpp |8 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2296c06..6032617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -202,6 +202,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - pulsemanager.{cpp,h}: reformat only.
 - pulsemanager.cpp: use initializer list for constructor.
 - pulsemanager.{cpp,h}: add pulse_version_{major,minor}_ member variables.
+- pulsemanager.cpp: reformat only.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index c1d8d8f..cd390bf 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -24,10 +24,10 @@
 #define DEBUG
 #endif
 
-PulseManager::PulseManager () : pulse_X2Go_("/.x2go/pulse"), pulse_port_(4713),
-state_(QProcess::NotRunning), 
pulse_server_(NULL),
-app_dir_(QApplication::applicationDirPath ()),
-pulse_version_major_(0), 
pulse_version_minor_(0) {
+PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"), pulse_port_ 
(4713),
+state_ (QProcess::NotRunning), pulse_server_ 
(NULL),
+app_dir_ (QApplication::applicationDirPath ()),
+pulse_version_major_ (0), pulse_version_minor_ 
(0) {
   pulse_dir_ = QDir (QDir::homePath ());
   pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
   pulse_dir_.cd (pulse_X2Go_.mid (1));

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 88/217: macbuild.sh: fix removal of base prefix in deduplication if base prefix ends in a slash.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 0d1a60999f83515e119771804b97248c99442401
Author: Mihai Moldovan 
Date:   Wed Sep 30 23:30:48 2015 +0200

macbuild.sh: fix removal of base prefix in deduplication if base prefix 
ends in a slash.
---
 debian/changelog |2 ++
 macbuild.sh  |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04e5f69..313d514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -190,6 +190,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   functionality "for real", not just as a dry-run.
 - macbuild.sh: spelling fix.
 - macbuild.sh: more more debug messages and a whitespace change.
+- macbuild.sh: fix removal of base prefix in deduplication if base prefix
+  ends in a slash.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index 9e44f15..25de145 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -394,7 +394,7 @@ if [ "${BUNDLE}" = "1" ]; then
 
   typeset -a top_files
   for entry in "${all_files[@]}"; do
-typeset relative_path="${entry##"${base_dir}/"}"
+typeset relative_path="${entry##"$(lazy_canonical_path "${base_dir}/")"}"
 typeset tmp_regex='^[^/]+$'
 echo "Checking ${relative_path} against regex '${tmp_regex}'"
 if [[ "${relative_path}" =~ ${tmp_regex} ]]; then
@@ -405,7 +405,7 @@ if [ "${BUNDLE}" = "1" ]; then
 
   typeset -a duplicates
   for entry in "${all_files[@]}"; do
-typeset relative_path="${entry##"${base_dir}/"}"
+typeset relative_path="${entry##"$(lazy_canonical_path "${base_dir}/")"}"
 typeset file_name="$(basename "${entry}")"
 typeset top_entry=""
 for top_entry in "${top_files[@]}"; do
@@ -447,7 +447,7 @@ if [ "${BUNDLE}" = "1" ]; then
 typeset -i i="0"
 for i in "${!all_files[@]}"; do
   typeset all_entry="${all_files[${i}]}"
-  typeset relative_path="${all_entry##"${base_dir}/"}"
+  typeset relative_path="${all_entry##"$(lazy_canonical_path 
"${base_dir}/")"}"
   if [ "${relative_path}" = "${entry}" ]; then
 unset all_files[${i}]
   fi

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 87/217: macbuild.sh: more debug messages and a whitespace change.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit c856afbdb0298621a0f3b4e9f5afec7ce4e2515c
Author: Mihai Moldovan 
Date:   Wed Sep 30 23:22:57 2015 +0200

macbuild.sh: more debug messages and a whitespace change.
---
 debian/changelog |1 +
 macbuild.sh  |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6c41bc5..04e5f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -189,6 +189,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: merge deduplicate.sh content in. Also enable the
   functionality "for real", not just as a dry-run.
 - macbuild.sh: spelling fix.
+- macbuild.sh: more more debug messages and a whitespace change.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index 8a2eba3..9e44f15 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -115,7 +115,6 @@ parse_otool_output() {
 
   typeset tmp_regex='^[[:space:]]+(.*)[[:space:]]\(compatibility version .*, 
current version .*\)'
 
-
   # In this special case, we do not want read to perform any word splitting.
   typeset oldifs="${IFS}"
   IFS=''
@@ -389,6 +388,7 @@ if [ "${BUNDLE}" = "1" ]; then
   typeset -a all_files
   typeset entry=""
   while read -r -d '' entry; do
+echo "Adding ${entry} to all files"
 all_files+=( "${entry}" )
   done < <(find "${base_dir}" -type 'f' -print0)
 
@@ -396,6 +396,7 @@ if [ "${BUNDLE}" = "1" ]; then
   for entry in "${all_files[@]}"; do
 typeset relative_path="${entry##"${base_dir}/"}"
 typeset tmp_regex='^[^/]+$'
+echo "Checking ${relative_path} against regex '${tmp_regex}'"
 if [[ "${relative_path}" =~ ${tmp_regex} ]]; then
   echo "${relative_path} is top file, adding to array."
   top_files+=( "${relative_path}" )

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 86/217: macbuild.sh: spelling fix.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 7ce769e08984b6a74af6d48f5bb2b7dc046ba5e4
Author: Mihai Moldovan 
Date:   Thu Sep 24 04:28:15 2015 +0200

macbuild.sh: spelling fix.
---
 debian/changelog |1 +
 macbuild.sh  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 099ea94..6c41bc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -188,6 +188,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: replace tabs with two spaces. No functional changes.
 - macbuild.sh: merge deduplicate.sh content in. Also enable the
   functionality "for real", not just as a dry-run.
+- macbuild.sh: spelling fix.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index 3fe7447..8a2eba3 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -162,7 +162,7 @@ if type -P port >/dev/null 2>&1; then
   MACPORTS_PREFIX_SEARCH="$(type -P port)"
   MACPORTS_PREFIX_SEARCH="${MACPORTS_PREFIX_SEARCH%%bin/port}"
 else
-  # Port not being part find in ${PATH} doesn't necessarily mean it isn't 
available.
+  # Port not being found in ${PATH} doesn't necessarily mean it isn't 
available.
   # Try to guess.
   MACPORTS_PREFIX_SEARCH="/opt/local/"
 fi

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 81/217: deduplicate.sh: add WARNING to status message.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 41ce98887283ec3cbe3fe42d10697905eb268bee
Author: Mihai Moldovan 
Date:   Thu Sep 24 03:40:35 2015 +0200

deduplicate.sh: add WARNING to status message.
---
 debian/changelog |1 +
 deduplicate.sh   |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7e6731..dcc033a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -182,6 +182,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   parse_otool_output debugging.
 - deduplicate.sh: fix wrong return value capture. We want to check the
   return value of the executed function/command, not that of "typeset".
+- deduplicate.sh: add WARNING to status message.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index 98f0b26..26182d4 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -203,7 +203,7 @@ for all_entry in "${all_files[@]}"; do
done
done <<< "${dependencies}"
else
-   echo "ERROR: otool returned error for file: ${all_entry}" >&2
-   exit 1
+   echo "WARNING: otool returned error for file: ${all_entry}" >&2
+   echo "WARNING: skipping." >&2
fi
 done

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 74/217: deduplicate.sh: save dependency format base string as a readonly variable and use that instead of repeating a fixed string.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 55a48492698109ab21995bc11454aedb9b458eed
Author: Mihai Moldovan 
Date:   Thu Aug 27 20:36:33 2015 +0200

deduplicate.sh: save dependency format base string as a readonly variable 
and use that instead of repeating a fixed string.
---
 debian/changelog |2 ++
 deduplicate.sh   |4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index edd221b..5fda8b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -166,6 +166,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   which is - hopefully - the id line.
 - deduplicate.sh: actually include file name in install_name_tool pseudo
   output.
+- deduplicate.sh: save dependency format base string as a readonly
+  variable and use that instead of repeating a fixed string.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index f020b9c..130a04e 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -6,6 +6,8 @@ base_dir="${1:?"No base dir given."}"
 typeset -a special_files_regex
 special_files_regex+=( "pulseaudio/libpulsecommon-[0-9]\.[0-9]\.dylib" )
 
+typeset -r dependency_base_format='@executable_path/../Frameworks/'
+
 typeset -a otool_fail_str
 otool_fail_str=( "is not an object file"
 "can't open file"
@@ -134,7 +136,7 @@ for entry in "${duplicates[@]}"; do
 
if [ -n "${filename}" ] && [ -n "${all_entry_filename}" ]; then
if [ "${filename}" = "${all_entry_filename}" ]; then
-   typeset 
dependency_format="@executable_path/../Frameworks/${all_entry##${base_dir}}"
+   typeset 
dependency_format="${dependency_base_format}/${all_entry##${base_dir}}"
to_files+=( "${dependency_format}" )
 
echo "${entry} => ${dependency_format}"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 79/217: deduplicate.sh: remove a bit of noisy debug output, but turn on parse_otool_output debugging.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 3df035d2690ec4ab5e57fdfda83b524014b6aeb3
Author: Mihai Moldovan 
Date:   Thu Aug 27 21:01:45 2015 +0200

deduplicate.sh: remove a bit of noisy debug output, but turn on 
parse_otool_output debugging.
---
 debian/changelog |2 ++
 deduplicate.sh   |7 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3df4af5..ac7258f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -178,6 +178,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   not good enough as it needs a bit cleanup - coming up next.
 - deduplicate.sh: cleanup as announced in the last commit - using
   lazy_canonical_path.
+- deduplicate.sh: remove a bit of noisy debug output, but turn on
+  parse_otool_output debugging.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index f8e5668..e357529 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -171,16 +171,17 @@ for all_entry in "${all_files[@]}"; do
typeset otool_out="$(otool -L "${all_entry}")"
 
typeset dependencies="$(parse_otool_output "${otool_out}")"
-   if [ "${?}" -eq 0 ]; then
+   echo "parse_otool_output return value: ${?}"
+   if [ "${?}" -eq "0" ]; then
typeset line=""
while read -r line; do
-   echo "dependency of ${all_entry}: ${line}"
+   #echo "dependency of ${all_entry}: ${line}"
 
typeset duplicate_entry=""
typeset -i i="0"
for i in "${!duplicates[@]}"; do
typeset duplicate_entry="${duplicates[${i}]}"
-   echo "checking for duplicate ${duplicate_entry}"
+   #echo "checking for duplicate 
${duplicate_entry}"
typeset duplicate_format="$(lazy_canonical_path 
"${dependency_base_format}/${duplicate_entry}")"
 
if [ -n "${line}" ] && [ -n 
"${duplicate_format}" ]; then

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 68/217: deduplicate.sh: prevent word splitting when parsing otool's output.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 8f5f3c292b1795f32b70084b283238aec4bc0f0f
Author: Mihai Moldovan 
Date:   Thu Aug 27 04:59:27 2015 +0200

deduplicate.sh: prevent word splitting when parsing otool's output.

We want the raw bits.
---
 debian/changelog |2 ++
 deduplicate.sh   |6 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4aa59c2..4e90061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -154,6 +154,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: record crafted "library path" values in duplicates
   replacement to_files array.
 - deduplicate.sh: debug parse_otool_output fiercely for the time being.
+- deduplicate.sh: prevent word splitting when parsing otool's output. We
+  want the raw bits.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index 5e1000f..93a5c8f 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -24,6 +24,11 @@ set -x
 
typeset tmp_regex='^[[:space:]]+(.*)[[:space:]]\(compatibility version 
.*, current version .*\)'
 
+
+   # In this special case, we do not want read to perform any word 
splitting.
+   typeset oldifs="${IFS}"
+   IFS=''
+
typeset line=""
while read -r line; do
if [[ "${line}" =~ ${tmp_regex} ]]; then
@@ -31,6 +36,7 @@ set -x
fi
done <<< "${raw_output}"
 
+   IFS="${oldifs}"
 set +x
return 0
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 76/217: deduplicate.sh: more temporary debugging output in fixup section.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 255dea1f94a84f4130e5774ca10cad5394caf450
Author: Mihai Moldovan 
Date:   Thu Aug 27 20:40:46 2015 +0200

deduplicate.sh: more temporary debugging output in fixup section.
---
 debian/changelog |1 +
 deduplicate.sh   |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f44c68f..5bb5851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -170,6 +170,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   variable and use that instead of repeating a fixed string.
 - deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now.
   deduplicate.sh will eventually be merged into macbuild.sh anyway.
+- deduplicate.sh: more temporary debugging output in fixup section.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index dadf334..12732a4 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -175,12 +175,14 @@ for all_entry in "${all_files[@]}"; do
typeset line=""
while read -r line; do
typeset dependencies_filename="$(basename "${line}")"
+   echo "dependency of ${all_entry}: ${line}"
 
typeset duplicate_entry=""
typeset -i i="0"
for i in "${!duplicates[@]}"; do
typeset duplicate_entry="${duplicates[${i}]}"
typeset duplicate_filename="$(basename 
"${duplicate_entry}")"
+   echo "checking for duplicate ${duplicate_entry}"
 
if [ -n "${dependencies_filename}" ] && [ -n 
"${duplicate_filename}" ]; then
if [ "${dependencies_filename}" = 
"${duplicate_filename}" ]; then

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 73/217: deduplicate.sh: actually include file name in install_name_tool pseudo output.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fa493c75d54e6c941f5d63e7587e4acd0fd3d428
Author: Mihai Moldovan 
Date:   Thu Aug 27 05:18:15 2015 +0200

deduplicate.sh: actually include file name in install_name_tool pseudo 
output.
---
 debian/changelog |2 ++
 deduplicate.sh   |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e10c1f7..edd221b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,6 +164,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: unstub fixup section.
 - deduplicate.sh: parse_otool_output: jump over first matching entry,
   which is - hopefully - the id line.
+- deduplicate.sh: actually include file name in install_name_tool pseudo
+  output.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index c24705d..f020b9c 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -170,7 +170,7 @@ for all_entry in "${all_files[@]}"; do
 
if [ -n "${dependencies_filename}" ] && [ -n 
"${duplicate_filename}" ]; then
if [ "${dependencies_filename}" = 
"${duplicate_filename}" ]; then
-   echo "install_name_tool -change 
\"${line}\" \"${to_files[${i}]}\""
+   echo "install_name_tool -change 
\"${line}\" \"${to_files[${i}]}\" \"${all_entry}\""
fi
else
echo "ERROR: empty file name while 
replacing duplicate dependencies." >&2

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 66/217: deduplicate.sh: record crafted "library path" values in duplicates replacement to_files array.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 1a742122ebcb3aad479af10a8ec247a469e811c7
Author: Mihai Moldovan 
Date:   Thu Aug 27 04:56:56 2015 +0200

deduplicate.sh: record crafted "library path" values in duplicates 
replacement to_files array.
---
 debian/changelog |2 ++
 deduplicate.sh   |5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 201186c..9d4c86d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   iff any of the strings are present in otool's output and actually handle
   the failure string *ARRAY* correctly as that.
 - deduplicate.sh: change exit to return in parse_otool_output.
+- deduplicate.sh: record crafted "library path" values in duplicates
+  replacement to_files array.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index 235d4b1..ab86a0b 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -117,9 +117,10 @@ for entry in "${duplicates[@]}"; do
 
if [ -n "${filename}" ] && [ -n "${all_entry_filename}" ]; then
if [ "${filename}" = "${all_entry_filename}" ]; then
-   to_files+=( "${all_entry}" )
+   typeset 
dependency_format="@executable_path/../Frameworks/${all_entry##${base_dir}}"
+   to_files+=( "${dependency_format}" )
 
-   echo "${entry} => ${all_entry}"
+   echo "${entry} => ${dependency_format}"
 
# There should be only one entry matching, so 
we can save a bit of time and break out of the loop.
# Even more importantly, we only want one entry 
for each duplicates entry anyway...

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 72/217: deduplicate.sh: parse_otool_output: jump over first matching entry, which is - hopefully - the id line.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 23841d4fc5c235b07bb3417982da7a98f322b3db
Author: Mihai Moldovan 
Date:   Thu Aug 27 05:17:24 2015 +0200

deduplicate.sh: parse_otool_output: jump over first matching entry, which 
is - hopefully - the id line.
---
 debian/changelog |2 ++
 deduplicate.sh   |   11 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e1f4412..e10c1f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -162,6 +162,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: add more useful information in fixup section's error
   message.
 - deduplicate.sh: unstub fixup section.
+- deduplicate.sh: parse_otool_output: jump over first matching entry,
+  which is - hopefully - the id line.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index 08f13df..c24705d 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -29,10 +29,19 @@ set -x
typeset oldifs="${IFS}"
IFS=''
 
+   # Used for skipping the first matching entry - which should typically 
be the ID line...
+   # That's a very naïve way to do this. Maybe there should be a bit more 
magic
+   # to catch this more reliably.
+   typeset -i first="1"
+
typeset line=""
while read -r line; do
if [[ "${line}" =~ ${tmp_regex} ]]; then
-   echo "${BASH_REMATCH[1]}"
+   if [ "${first}" -ne "1" ]; then
+   echo "${BASH_REMATCH[1]}"
+   else
+   first="0"
+   fi
fi
done <<< "${raw_output}"
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 67/217: deduplicate.sh: debug parse_otool_output fiercely for the time being.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 29b86418c2e3b7258e0c31898015966a00c39ba7
Author: Mihai Moldovan 
Date:   Thu Aug 27 04:57:54 2015 +0200

deduplicate.sh: debug parse_otool_output fiercely for the time being.
---
 debian/changelog |1 +
 deduplicate.sh   |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d4c86d..4aa59c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -153,6 +153,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: change exit to return in parse_otool_output.
 - deduplicate.sh: record crafted "library path" values in duplicates
   replacement to_files array.
+- deduplicate.sh: debug parse_otool_output fiercely for the time being.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index ab86a0b..5e1000f 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -12,6 +12,7 @@ otool_fail_str=( "is not an object file"
 "Archive : " )
 
 parse_otool_output() {
+set -x
typeset raw_output="${@}"
 
typeset fail_str=""
@@ -30,6 +31,7 @@ parse_otool_output() {
fi
done <<< "${raw_output}"
 
+set +x
return 0
 }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 70/217: deduplicate.sh: add more useful information in fixup section's error message.

[git-admin]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5b81608fa6472504130a7d28ee98da0a3a6eecab
Author: Mihai Moldovan 
Date:   Thu Aug 27 05:06:04 2015 +0200

deduplicate.sh: add more useful information in fixup section's error 
message.
---
 debian/changelog |2 ++
 deduplicate.sh   |4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1870fd6..bcaa794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -159,6 +159,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: switch to range-based for loop in fixup section for
   duplicate array walking as we need to access the same element index in
   the replacement array.
+- deduplicate.sh: add more useful information in fixup section's error
+  message.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index d625590..7dc6cd0 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -162,7 +162,9 @@ for all_entry in "${all_files[@]}"; do
if [ -n "${dependencies_filename}" ] && [ -n 
"${duplicate_filename}"]; then

else
-   echo "ERROR: empty file name while 
duplicates with dependencies." >&2
+   echo "ERROR: empty file name while 
replacing duplicate dependencies." >&2
+   echo "ERROR: for file ${all_entry}" >&2
+   echo "ERROR: at dependency ${line}" >&2
echo "ERROR: duplicate entry: 
\"${duplicate_entry}\"" >&2
echo "ERROR: dependency: \"${line}\"" 
>&2
exit 1

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits