[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.1.0.5-10-g55eb03e

X2Go dev team git-admin at x2go.org
Sat Jun 8 01:13:29 CEST 2013


The branch, build-main has been updated
       via  55eb03e343db26040beeb3af2592e9be3f092e41 (commit)
      from  b40f007de1db835fbda46497250654a8d9d454e5 (commit)

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

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index bd843e7..b080687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low
     - Prepare for translating into the current project
       languages (da, de, es, fr, nb_no, ru, sv, zh_tw).
     - Update German translation file (not much to do).
+    - Fix TEMP path for finding the x2godesktopsharing socket.
+      Solves issues on setups where pam_tmpdir.so is in use.
+      (Closes upstream issue #69).
 
   [ Daniel Lindgren ]
   * New upstream version (3.1.0.6):
diff --git a/main.cpp b/main.cpp
index d3733b5..039c617 100644
--- a/main.cpp
+++ b/main.cpp
@@ -51,8 +51,9 @@ void  client ( const QStringList & cmd )
 	cmd.join(" ").toAscii().data() <<std::endl;
 
 	QString dispname=params[2];
-	QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+
-	                   params[1]+"@"+dispname;
+	// QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+
+	//                   params[1]+"@"+dispname;
+	QString socketName=/tmp/x2godesktopsharing_@" + params[1]+"@"+dispname;
 	QLocalSocket sock;
 	sock.connectToServer ( socketName );
 	if ( !sock.waitForConnected ( 3000 ) )


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

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




More information about the x2go-commits mailing list