[X2Go-Commits] lightdm-remote-session-x2go.git - x2gosessiontype (branch) updated: da2b0689a4caa0d04ea476f707c47950563c5b16

X2Go dev team git-admin at x2go.org
Wed Apr 24 17:54:43 CEST 2013


The branch, x2gosessiontype has been updated
  discards  c30ddbd7eeb3e35732eae1055e382436524ab3a4 (commit)
       via  da2b0689a4caa0d04ea476f707c47950563c5b16 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (c30ddbd7eeb3e35732eae1055e382436524ab3a4)
            \
             N -- N -- N (da2b0689a4caa0d04ea476f707c47950563c5b16)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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:
 freerdp-session.in |    2 +-
 socket-sucker.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/freerdp-session.in b/freerdp-session.in
index 7eaead3..8868336 100755
--- a/freerdp-session.in
+++ b/freerdp-session.in
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -e ~/.freerdp-socket ]; then
-	@pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so -f --from-stdin
+	@pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so --no-nla -f --from-stdin
 else
 	zenity --warning --text="Unable to locate FreeRDP socket"
 fi;
diff --git a/socket-sucker.c b/socket-sucker.c
index 35424a6..8e8ad25 100644
--- a/socket-sucker.c
+++ b/socket-sucker.c
@@ -69,7 +69,7 @@ main (int argc, char * argv[])
 
 	close(socket_fd);
 
-	if (in > 0 && out > 0) {
+	if (in > 0 && out > 0 && in == out) {
 		return 0;
 	} else {
 		return -1;


hooks/post-receive
-- 
lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM)

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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).




More information about the x2go-commits mailing list