[X2Go-Commits] [x2goserver] 01/01: fix for last cherry-picking...

git-admin at x2go.org git-admin at x2go.org
Fri Oct 24 12:36:18 CEST 2014


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 1ae7420abb0aab1b8fb1aee9a165af6e57163d2f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 24 12:36:00 2014 +0200

    fix for last cherry-picking...
---
 x2goserver/bin/x2golistsessions       |    4 ++--
 x2goserver/sbin/x2golistsessions_root |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index e7948af..ea03833 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -73,7 +73,7 @@ for (my $i=0;$i<@outp;$i++)
 		{
 			if (@sinfo[4]eq 'R')
 			{
-				if(is_suspended(@sinfo[1], @sinfo[11]))
+				if(session_is_suspended(@sinfo[1], @sinfo[11]))
 				{
 					db_changestatus( 'S', @sinfo[1]);
 					@outp[$i] =~ s/\|R\|/\|S\|/;
@@ -83,7 +83,7 @@ for (my $i=0;$i<@outp;$i++)
 			}
 			elsif (@sinfo[4]eq 'S')
 			{
-				if(is_running(@sinfo[1], @sinfo[11]))
+				if(session_is_running(@sinfo[1], @sinfo[11]))
 				{
 					db_changestatus( 'R', @sinfo[1] );
 					@outp[$i] =~ s/\|S\|/\|R\|/;
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index a55035d..499ebc5 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -54,7 +54,7 @@ for (my $i=0;$i<@outp;$i++)
 		{
 			if (@sinfo[4]eq 'R')
 			{
-				if (is_suspended(@sinfo[1], at sinfo[11]))
+				if (session_is_suspended(@sinfo[1], at sinfo[11]))
 				{
 					system("su", "-", "@sinfo[11]", "-c", "$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] > /dev/null");
 					@outp[$i] =~ s/\|R\|/\|S\|/;

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list