[X2go-Commits] x2godesktopsharing.git - master (branch) updated: 3.1.0.5-10-g55eb03e
X2Go dev team
git-admin at x2go.org
Mon Dec 3 09:02:12 CET 2012
The branch, master has been updated
via 55eb03e343db26040beeb3af2592e9be3f092e41 (commit)
via b40f007de1db835fbda46497250654a8d9d454e5 (commit)
via ef891ba6480d5407b7253bc1ca4bac4264d3163d (commit)
from 93331c08a1798b3d21279f2cabbec0162faa09e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 55eb03e343db26040beeb3af2592e9be3f092e41
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Dec 3 09:02:01 2012 +0100
Fix TEMP path for finding the x2godesktopsharing socket. Solves issues on setups where pam_tmpdir.so is in use. (Closes upstream issue #69).
commit b40f007de1db835fbda46497250654a8d9d454e5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Nov 27 22:00:43 2012 +0100
run lrelease-qt4 before qmake
commit ef891ba6480d5407b7253bc1ca4bac4264d3163d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Nov 27 22:00:20 2012 +0100
fix Dutch translation file
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +++
debian/rules | 1 +
main.cpp | 5 +++--
x2godesktopsharing_nl.ts | 2 +-
4 files changed, 8 insertions(+), 3 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/debian/rules b/debian/rules
index 6add866..5d1039c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
+ lrelease-qt4 x2godesktopsharing.pro
qmake-qt4 x2godesktopsharing.pro
touch configure-stamp
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 ) )
diff --git a/x2godesktopsharing_nl.ts b/x2godesktopsharing_nl.ts
index 6f75276..5520335 100644
--- a/x2godesktopsharing_nl.ts
+++ b/x2godesktopsharing_nl.ts
@@ -145,7 +145,7 @@ en start opnieuw</translation>
<message>
<location filename="sharetray.cpp" line="587"/>
<source>X2Go Desktop Sharing</source>
- <translation>X2Go Desktop Sharing<translation>
+ <translation>X2Go Desktop Sharing</translation>
</message>
</context>
<context>
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