31 Jan '12
The branch, master has been updated
via 986103a27f73a8a133b5b5acd10e2d7675da3e7a (commit)
from 504ab9ae092405ab51e8fe975961114356997bf4 (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 986103a27f73a8a133b5b5acd10e2d7675da3e7a
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Jan 31 23:44:28 2012 +0100
more X2go -> X2Go
-----------------------------------------------------------------------
Summary of changes:
Makefile.docupload | 2 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/Makefile.docupload b/Makefile.docupload
index 3963db4..ff760c0 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -14,7 +14,7 @@ docbuild:
mkdir -p .epydoc/pdf
mkdir -p .epydoc/pdf.tmp
rm -Rf .epydoc/html/*
- epydoc --debug -n "Python X2go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
+ epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
#epydoc --debug --pdf --no-private -o .epydoc/pdf.tmp x2go/
#mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2go_API.pdf
#rm -Rf .epydoc/pdf.tmp
diff --git a/debian/rules b/debian/rules
index 227d85e..a912612 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ build:
mkdir -p .epydoc/pdf
mkdir -p .epydoc/pdf.tmp
rm -Rf .epydoc/html/*
- epydoc --debug -n "Python X2go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
+ epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
#epydoc --debug --pdf --no-private -o .epydoc/pdf.tmp x2go/
#mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2go_API.pdf
#rm -Rf .epydoc/pdf.tmp
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
31 Jan '12
The branch, master has been updated
via a92896977c367567119f309411cff500fea1dbaf (commit)
from d33f8630e4104fa08703a0bad4c052084fdef696 (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 a92896977c367567119f309411cff500fea1dbaf
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Jan 31 23:38:38 2012 +0100
Replace non-code strings ,,X2go'' by ,,X2Go''.
-----------------------------------------------------------------------
Summary of changes:
README | 4 +-
debian/changelog | 18 ++++++-----
man/man1/pyhoca-cli.1 | 44 ++++++++++++++--------------
pyhoca-cli | 54 +++++++++++++++++-----------------
pyhoca/cli/frontend.py | 74 ++++++++++++++++++++++++------------------------
setup.py | 2 +-
6 files changed, 99 insertions(+), 97 deletions(-)
The diff of changes is:
diff --git a/README b/README
index 5c9985f..84cba90 100644
--- a/README
+++ b/README
@@ -20,8 +20,8 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
=== Current features ===
-* start a new session on an X2go server
-* resume a suspended session on an X2go server
+* start a new session on an X2Go server
+* resume a suspended session on an X2Go server
* suspend a running session (hit Ctrl+C)
* terminate a running session
* retrieve a list of running sessions
diff --git a/debian/changelog b/debian/changelog
index 8f81b52..db59077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
pyhoca-cli (0.1.4.3-0~x2go1) UNRELEASED; urgency=low
+ * New upstream version (0.1.4.3):
+ - Replace non-code strings ,,X2go'' by ,,X2Go''.
* Add python-suport (>=0.90) as dependency. Fix project name in control
file.
* Add proper license to copyright file.
@@ -33,14 +35,14 @@ pyhoca-cli (0.1.4.0-0~x2go2) unstable; urgency=low
* Already prepare for new upstream version (0.1.4.1):
- README/TODO update.
- * Depend on Python X2go 0.1.1.2.
+ * Depend on Python X2Go 0.1.1.2.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 05 Jul 2011 21:22:28 +0200
pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low
* New upstream version (0.1.4.0):
- - Add X2go desktop sharing support.
+ - Add X2Go desktop sharing support.
- Terminate shared desktop sessions of Ctrl-C (instead of
suspending them.
* React to bug #627990, prefer man2html-base over man2html.
@@ -57,7 +59,7 @@ pyhoca-cli (0.1.3.3-0~x2go1) unstable; urgency=low
* new upstream version (0.1.3.3):
- adds man page in html format
- * depending on new Python X2go version (0.1.0.0)
+ * depending on new Python X2Go version (0.1.0.0)
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 26 May 2011 12:05:11 +0200
@@ -89,14 +91,14 @@ pyhoca-cli (0.1.3.0-0~nwt1) unstable; urgency=low
pyhoca-cli (0.1.3-0~nwt2) lucid maverick testing unstable; urgency=low
- * update Python X2go dependency
+ * update Python X2Go dependency
* added python-setproctitle as dependency
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 01:13:00 +0100
pyhoca-cli (0.1.3-0~nwt1) lucid maverick testing unstable; urgency=low
- * minor fix for new Python X2go version
+ * minor fix for new Python X2Go version
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 00:28:00 +0100
@@ -109,13 +111,13 @@ pyhoca-cli (0.1.2-0~nwt2) lucid maverick testing unstable; urgency=low
pyhoca-cli (0.1.2-0~nwt1) lucid maverick testing unstable; urgency=low
* disabled use_cache for X2goClient instance
- * depending on Python X2go 0.0.22
+ * depending on Python X2Go 0.0.22
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:45:00 +0100
pyhoca-cli (0.1.1-0~nwt1) lucid maverick testing unstable; urgency=low
- * adapted to run with Python X2go v0.0.21
+ * adapted to run with Python X2Go v0.0.21
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 09 Dec 2010 23:30:00 +0100
@@ -134,7 +136,7 @@ pyhoca-cli (0.0.15-0~nwt1) lucid maverick testing unstable; urgency=low
pyhoca-cli (0.0.14-0~nwt2) lucid maverick testing unstable; urgency=low
- * depending on bugfix Python X2go version 0.0.12 (or higher)
+ * depending on bugfix Python X2Go version 0.0.12 (or higher)
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Wed, 13 Oct 2010 14:12:00 +0200
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 0d26795..efbc033 100644
--- a/man/man1/pyhoca-cli.1
+++ b/man/man1/pyhoca-cli.1
@@ -5,9 +5,9 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH pyhoca-cli 1 "07 Sep 2011" "Version 0.1.4.x" "X2go Application"
+.TH pyhoca-cli 1 "07 Sep 2011" "Version 0.1.4.x" "X2Go Application"
.SH NAME
-pyhoca-cli \- X2go command line client written in Python
+pyhoca-cli \- X2Go command line client written in Python
.SH SYNOPSIS
'nh
.fi
@@ -22,11 +22,11 @@ pyhoca-cli \- X2go command line client written in Python
.ad b
'hy
.SH DESCRIPTION
-\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2go command line client written
+\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2Go command line client written
in Python.
.PP
You can use it
-for scripting remote X2go sessions or simply starting, resuming or shadowing X2go sessions from
+for scripting remote X2Go sessions or simply starting, resuming or shadowing X2Go sessions from
the command line in a terminal.
.PP
It supports versatile
@@ -50,17 +50,17 @@ No output to stdout at all!
Enable debugging output.
.TP
\*(T<\fB\-\-libdebug\fR\*(T>
-Enable debugging code of the unterlying Python X2go module.
+Enable debugging code of the unterlying Python X2Go module.
.TP
\*(T<\fB\-\-libdebug-sftpxfer\fR\*(T>
Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data).
.SH SERVER / SESSION PROFILE
You either have to specify a server name or a pre-configured X2goClient session profile to tell \fBpyhoca-cli\fR to
-what X2go server to connect. \fBpyhoca-cli\fR will not start
+what X2Go server to connect. \fBpyhoca-cli\fR will not start
if neither of these two options has been given on the command line.
.TP
\*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T>
-If not in LDAP mode you always have to name the remote X2go server's hostname or IP address.
+If not in LDAP mode you always have to name the remote X2Go server's hostname or IP address.
.TP
\*(T<\fB\-P, \-\-session-profile\fR \fI<SESSION_PROFILE_NAME>\fR\*(T>
The name of the session profile to be used to make the connection.
@@ -68,30 +68,30 @@ The name of the session profile to be used to make the connection.
\fBpyhoca-cli\fR accepts exclusively one of the listed actions:
.TP
\*(T<\fB\-N, \-\-new\fR\*(T>
-Start a new X2go session on server (default mode if no mode is explicitly specified).
+Start a new X2Go session on server (default mode if no mode is explicitly specified).
.TP
\*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T>
-Resume existing X2go session <SESSION_NAME> on server. Special values for <SESSION_NAME> are ,,NEWEST'' (will resume youngest session)
+Resume existing X2Go session <SESSION_NAME> on server. Special values for <SESSION_NAME> are ,,NEWEST'' (will resume youngest session)
or ,,OLDEST'' (resume session with oldest timestamp).
.TP
\*(T<\fB\-D, \-\-share-desktop\fR \fI<USER>@<DISPLAY>\fR\*(T>
-Share an X2go session on the remote server specified by <USER>@<DISPLAY>,
+Share an X2Go session on the remote server specified by <USER>@<DISPLAY>,
whereas <USER> can be the same user that is starting the share mode session or any
-other user that grants X2go desktop sharing for the current user.
+other user that grants X2Go desktop sharing for the current user.
.TP
\*(T<\fB\-S, \-\-suspend\fR \fI<SESSION_NAME>\fR\*(T>
-Suspend running X2go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user).
+Suspend running X2Go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user).
.TP
\*(T<\fB\-T, \-\-terminate\fR \fI<SESSION_NAME>\fR\*(T>
-Terminate running X2go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user).
+Terminate running X2Go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user).
.TP
\*(T<\fB\-L, \-\-list-sessions\fR\*(T>
-List user's X2go sessions on server.
+List user's X2Go sessions on server.
.SH ACTION OPTIONS
\fBpyhoca-cli\fR actions can be tweaked by these options:
.TP
\*(T<\fB\-\-clean-sessions\fR\*(T>
-Clean all of the user's suspended/running sessions before starting a new one on the named X2go server.
+Clean all of the user's suspended/running sessions before starting a new one on the named X2Go server.
.TP
\*(T<\fB\-\-terminate-on-ctrl-c\fR\*(T>
Terminate the connected session when pressing CTRL+C (instead of suspending the session).
@@ -109,7 +109,7 @@ authentication. The cleartext password that has been specified at the command li
the systems process list (Linux, MacOS). On Windows systems the usage of the --password option is forbidden.
.TP
\*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T>
-Remote X2go server's SSH port (default: 22).
+Remote X2Go server's SSH port (default: 22).
.TP
\*(T<\fB\-k, \-\-ssh-privkey\fR \fI<SSH_PRIVKEY>\fR\*(T>
Use file <SSH_PRIVKEY> as private key for SSH connections (default: ~/.ssh/id_rsa).
@@ -118,16 +118,16 @@ Use file <SSH_PRIVKEY> as private key for SSH connections (default: ~/.ssh/id_rs
Add RSA/DSA host key to ~/.ssh/known_hosts if authenticity of server can't be established (default: not set).
.TP
\*(T<\fB\-\-sound\fR \fI{pulse|esd|none}\fR\*(T>
-X2go server's sound system (default: 'pulse').
+X2Go server's sound system (default: 'pulse').
.TP
\*(T<\fB\-F, \-\-share-local-folders\fR \fI<folder1>[,<folder2>[,...]]\fR\*(T>
-A comma separated list of local folders that shall be made available in the remote X2go session.
+A comma separated list of local folders that shall be made available in the remote X2Go session.
.TP
\*(T<\fB\-\-printing\fR\*(T>
-Use X2go printing (default: disabled).
+Use X2Go printing (default: disabled).
.TP
\*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T>
-Share mode for X2go desktop sharing (0: view-only, 1: full access).
+Share mode for X2Go desktop sharing (0: view-only, 1: full access).
.TP
\*(T<\fB\-\-time-to-wait\fR\*(T>
Time to wait for session startup/resume (default: 8s). There should be no need to touch this, unless on very slow network connections.
@@ -161,7 +161,7 @@ Use keyboard layout (default: 'us').
\*(T<\fB\-\-kbd\-type\fR \fI{pc105/us|pc105/de|...}\fR\*(T>
Set Keyboard type (default 'pc105/us').
.SH COMPATIBILITY OPTIONS
-\fBpyhoca-cli\fR aims at being fully compatible with all command line options and session config files of the X2go project's X2go command
+\fBpyhoca-cli\fR aims at being fully compatible with all command line options and session config files of the X2Go project's X2Go command
line client \fBx2goclient-cli\fR as well as the \fBx2goclient\fR GUI. This is still work in progress.
To achieve this, some compatibility options have already
been added:
@@ -196,6 +196,6 @@ rfb-hextile, rfb-tight, rfb-tight-compressed
.SH "SEE ALSO"
\fB/usr/share/doc/python-x2go\fR
.SH AUTHOR
-This manual has been written by for the X2go project (http://www.x2go.org) by
+This manual has been written by for the X2Go project (http://www.x2go.org) by
Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
diff --git a/pyhoca-cli b/pyhoca-cli
index c6752d9..a21fe0a 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -57,7 +57,7 @@ import getpass
import paramiko
from types import *
-# Python X2go provides the current local username (OS independent)
+# Python X2Go provides the current local username (OS independent)
from x2go.defaults import CURRENT_LOCAL_USER as current_user
from x2go.defaults import X2GO_PRINT_ACTIONS
@@ -71,7 +71,7 @@ from pyhoca.cli import current_home, PyHocaCLI, runtime_error
from pyhoca.cli import __VERSION__ as _version
VERSION=_version
VERSION_TEXT="""
-%s[%s] - an X2go command line client written in Python
+%s[%s] - an X2Go command line client written in Python
----------------------------------------------------------------------
developed by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>
@@ -90,21 +90,21 @@ liblogger = x2go.X2goLogger()
# exclusive client control options
action_options = [
- {'args':['-N','--new'], 'default': False, 'action': 'store_true', 'help': 'start a new X2go session on server (default)', },
- {'args':['-R','--resume'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'resume a suspended X2go session with name SESSION_NAME', },
- {'args':['-D','--share-desktop'], 'default': None, 'metavar': 'USER@DISPLAY', 'help': 'share an X2go session on server specified by USER@DISPLAY', },
- {'args':['-S','--suspend'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'suspend running X2go session SESSION_NAME', },
- {'args':['-T','--terminate'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'terminate running X2go session SESSION_NAME', },
- {'args':['-L','--list-sessions'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2go sessions on server', },
- {'args':['--list-desktops'], 'default': False, 'action': 'store_true', 'help': 'list X2go desktop sessions that are available for sharing', },
- {'args':['-l','--list-profiles'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2go pre-configured session profiles', },
+ {'args':['-N','--new'], 'default': False, 'action': 'store_true', 'help': 'start a new X2Go session on server (default)', },
+ {'args':['-R','--resume'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'resume a suspended X2Go session with name SESSION_NAME', },
+ {'args':['-D','--share-desktop'], 'default': None, 'metavar': 'USER@DISPLAY', 'help': 'share an X2Go session on server specified by USER@DISPLAY', },
+ {'args':['-S','--suspend'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'suspend running X2Go session SESSION_NAME', },
+ {'args':['-T','--terminate'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'terminate running X2Go session SESSION_NAME', },
+ {'args':['-L','--list-sessions'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2Go sessions on server', },
+ {'args':['--list-desktops'], 'default': False, 'action': 'store_true', 'help': 'list X2Go desktop sessions that are available for sharing', },
+ {'args':['-l','--list-profiles'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2Go pre-configured session profiles', },
{'args':['-P','--session-profile'], 'default': None, 'help': 'load x2goclient session profiles and use the session profile SESSION_PROFILE', },
]
# debug options...
debug_options = [
{'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', },
{'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', },
- {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2go module', },
+ {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2Go module', },
{'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', },
{'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
]
@@ -117,20 +117,20 @@ x2go_options = [
{'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', },
{'args':['-k','--ssh-privkey'], 'default': None, 'help': 'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g. ~/.ssh/id_rsa)', },
{'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'add RSA host key fingerprint to ~/.ssh/known_hosts if authenticity of server can\'t be established (default: not set)', },
- {'args':['--sound'], 'default': 'pulse', 'choices': ('pulse', 'esd', 'none'), 'help': 'X2go server sound system (default: \'pulse\')', },
- {'args':['--printing'], 'default': False, 'action': 'store_true', 'help': 'use X2go printing (default: disabled)', },
- {'args':['--share-mode'], 'default': 0, 'help': 'share mode for X2go desktop sharing (0: view-only, 1: full access)', },
- {'args':['-F', '--share-local-folders'], 'metavar': '<folder1>[,<folder2[,...]]', 'default': None, 'help': 'a comma separated list of local folder names to mount in the X2go session', },
+ {'args':['--sound'], 'default': 'pulse', 'choices': ('pulse', 'esd', 'none'), 'help': 'X2Go server sound system (default: \'pulse\')', },
+ {'args':['--printing'], 'default': False, 'action': 'store_true', 'help': 'use X2Go printing (default: disabled)', },
+ {'args':['--share-mode'], 'default': 0, 'help': 'share mode for X2Go desktop sharing (0: view-only, 1: full access)', },
+ {'args':['-F', '--share-local-folders'], 'metavar': '<folder1>[,<folder2[,...]]', 'default': None, 'help': 'a comma separated list of local folder names to mount in the X2Go session', },
{'args':['--clean-sessions'], 'default': False, 'action': 'store_true', 'help': 'clean all suspended sessions before starting a new one', },
{'args':['--terminate-on-ctrl-c'], 'default': False, 'action': 'store_true', 'help': 'terminate the connected session when pressing CTRL+C (instead of suspending the session)', },
{'args':['--time-to-wait'], 'default': '8', 'help': 'time to wait for session startup/resume (default: 8s)', },
{'args':['--auth-attempts'], 'default': 3, 'help': 'number of authentication attempts before authentication fails (default: 3)', },
]
print_options = [
- {'args':['--print-action'], 'default': 'PDFVIEW', 'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2go print jobs (default: \'PDFVIEW\')', },
- {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF viewer command for displaying incoming X2go print jobs (default: \'%s\'); this option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,},
+ {'args':['--print-action'], 'default': 'PDFVIEW', 'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2Go print jobs (default: \'PDFVIEW\')', },
+ {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF viewer command for displaying incoming X2Go print jobs (default: \'%s\'); this option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,},
{'args':['--save-to-folder'], 'default': None, 'metavar': 'PRINT_DEST', 'help': 'save print jobs as PDF files to folder PRINT_DEST (default: \'%s\'); this option selects \'--print-action PDFSAVE\'' % DEFAULT_PDFSAVE_LOCATION,},
- {'args':['--printer'], 'default': None, 'help': 'target CUPS print queue for incoming X2go print jobs (default: CUPS default printer); this option selects \'--print-action CUPS\'',},
+ {'args':['--printer'], 'default': None, 'help': 'target CUPS print queue for incoming X2Go print jobs (default: CUPS default printer); this option selects \'--print-action CUPS\'',},
{'args':['--print-cmd'], 'default': None, 'help': 'print command including cmd line arguments (default: \'%s\'); this option selects \'--print-action PRINTCMD\'' % DEFAULT_PRINTCMD_CMD,},
]
nx_options = [
@@ -145,7 +145,7 @@ compat_options = [
{'args':['--port'], 'default': None, 'help': 'compatibility option, synonymous to --remote-ssh-port PORT', },
{'args':['--ssh-key'], 'default': None, 'help': 'compatibility option, synonymous to --ssh-privkey SSH_KEY', },
{'args':['--use-sound'], 'default': None, 'choices': ('yes', 'no'), 'help': 'compatibility option, synonymous to --sound {pulse|none}', },
- {'args':['--client-ssh-port'], 'default': None, 'help': 'compatibility option for the x2goclient GUI; as Python X2go brings its own internal SFTP server, this option will be ignored', },
+ {'args':['--client-ssh-port'], 'default': None, 'help': 'compatibility option for the x2goclient GUI; as Python X2Go brings its own internal SFTP server, this option will be ignored', },
]
@@ -165,19 +165,19 @@ def parseargs():
global logger
global liblogger
- p = argparse.ArgumentParser(description='X2go command line client implemented in Python.',\
+ p = argparse.ArgumentParser(description='X2Go command line client implemented in Python.',\
epilog="""
Possible values for the --pack NX option are:
%s
""" % x2go.defaults.pack_methods_nx3_formatted, \
formatter_class=argparse.RawDescriptionHelpFormatter, \
add_help=True, argument_default=None)
- p_reqargs = p.add_argument_group('X2go server name is always required')
+ p_reqargs = p.add_argument_group('X2Go server name is always required')
p_reqargs.add_argument('--server', help='server hostname or IP address')
p_actionopts = p.add_argument_group('client actions')
p_debugopts = p.add_argument_group('debug options')
- p_x2goopts = p.add_argument_group('X2go options')
- p_printopts = p.add_argument_group('X2go print options')
+ p_x2goopts = p.add_argument_group('X2Go options')
+ p_printopts = p.add_argument_group('X2Go print options')
p_nxopts = p.add_argument_group('NX options')
p_compatopts = p.add_argument_group('compatibility options')
@@ -240,7 +240,7 @@ Possible values for the --pack NX option are:
if not (a.resume or a.share_desktop or a.suspend or a.terminate or a.list_sessions or a.list_desktops or a.list_profiles):
a.new = True
- # X2go printing
+ # X2Go printing
if ((a.pdfview_cmd and a.printer) or
(a.pdfview_cmd and a.save_to_folder) or
(a.pdfview_cmd and a.print_cmd) or
@@ -344,7 +344,7 @@ if __name__ == '__main__':
_session_profiles = x2go.X2goSessionProfiles()
# retrieve a session list
print
- print "Available X2go session profiles"
+ print "Available X2Go session profiles"
print "==============================="
print "configuration files: %s" % _session_profiles.config_files
print "user configuration file: %s" % _session_profiles.user_config_file
@@ -359,8 +359,8 @@ if __name__ == '__main__':
else:
- # initialize the X2GoClient context and start the connection to the X2go server
- logger('preparing requested X2go session', x2go.loglevel_NOTICE, )
+ # initialize the X2GoClient context and start the connection to the X2Go server
+ logger('preparing requested X2Go session', x2go.loglevel_NOTICE, )
thisPyHocaCLI = PyHocaCLI(args, logger=logger, liblogger=liblogger)
thisPyHocaCLI.authenticate()
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 363d9e9..5d650a3 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -33,7 +33,7 @@ from gevent import socket
# for debugging
import pprint
-# a list of available X2go print actions
+# a list of available X2Go print actions
from x2go.defaults import X2GO_PRINT_ACTIONS
# use current_home as user home dir
@@ -79,7 +79,7 @@ class PyHocaCLI(x2go.X2goClient):
"""
# retrieve a session list
print
- print "Available runing/suspended X2go sessions"
+ print "Available runing/suspended X2Go sessions"
print "========================================"
_peername = self._X2goClient__get_session_server_peername(s_hash)
print "Host: %s - [%s]:%s" % (self._X2goClient__get_session_server_hostname(s_hash), _peername[0], _peername[1])
@@ -105,7 +105,7 @@ class PyHocaCLI(x2go.X2goClient):
print "suspended since: %s" % session_info.date_suspended
print
else:
- print "No running/suspended sessions found on X2go server."
+ print "No running/suspended sessions found on X2Go server."
print
def list_desktops(self, s_hash):
@@ -114,7 +114,7 @@ class PyHocaCLI(x2go.X2goClient):
"""
# retrieve a desktop list
print
- print "X2go desktops available for sharing"
+ print "X2Go desktops available for sharing"
print "==================================="
_peername = self._X2goClient__get_session_server_peername(s_hash)
print "Host: %s - [%s]:%s" % (self._X2goClient__get_session_server_hostname(s_hash), _peername[0], _peername[1])
@@ -125,13 +125,13 @@ class PyHocaCLI(x2go.X2goClient):
for desktop_name in desktop_list:
print desktop_name
else:
- print "No X2go desktop sessions found that are available for desktop sharing."
+ print "No X2Go desktop sessions found that are available for desktop sharing."
print
def list_profiles(self):
# retrieve a session list
print
- print "Available X2go session profiles"
+ print "Available X2Go session profiles"
print "==============================="
_profiles = self._X2goClient__get_profiles()
for _profile_id in _profiles.profile_ids:
@@ -150,8 +150,8 @@ class PyHocaCLI(x2go.X2goClient):
_server = _profiles.get_session_param(self.args.session_profile, 'server')
else:
_server = self.args.server
- # clean all sessions from X2go server
- self.logger('cleaning up all running sessions from X2go server: %s' % _server, loglevel=x2go.loglevel_NOTICE, )
+ # clean all sessions from X2Go server
+ self.logger('cleaning up all running sessions from X2Go server: %s' % _server, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__clean_sessions(s_hash)
def new_session(self, s_hash):
@@ -159,7 +159,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# start a new session and run a command
- self.logger('starting a new X2go session', loglevel=x2go.loglevel_INFO, )
+ self.logger('starting a new X2Go session', loglevel=x2go.loglevel_INFO, )
if self.args.session_profile is None:
self.logger('command for new session is: %s' % self.args.command, loglevel=x2go.loglevel_DEBUG, )
else:
@@ -170,7 +170,7 @@ class PyHocaCLI(x2go.X2goClient):
session_infos = self._X2goClient__list_sessions(s_hash)
if session_infos:
newest_session_name = x2go.utils.session_names_by_timestamp(session_infos)[-1]
- self._pyhoca_logger("Resuming newest X2go session %s..." % newest_session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("Resuming newest X2Go session %s..." % newest_session_name, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__resume_session(s_hash, newest_session_name)
return True
return False
@@ -179,7 +179,7 @@ class PyHocaCLI(x2go.X2goClient):
session_infos = self._X2goClient__list_sessions(s_hash)
if session_infos:
oldest_session_name = x2go.utils.session_names_by_timestamp(session_infos)[0]
- self._pyhoca_logger("Resuming oldest X2go session %s..." % oldest_session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("Resuming oldest X2Go session %s..." % oldest_session_name, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__resume_session(s_hash, oldest_session_name)
return True
return False
@@ -189,7 +189,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# resume a running session
- self.logger('resuming X2go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, )
+ self.logger('resuming X2Go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if available_sessions and self.args.resume == 'OLDEST':
self._auto_resume_oldest(s_hash)
@@ -198,7 +198,7 @@ class PyHocaCLI(x2go.X2goClient):
elif self.args.resume in available_sessions.keys():
self._X2goClient__resume_session(s_hash, self.args.resume)
else:
- self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20)
+ self._runtime_error('requested session not available on X2Go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20)
def share_desktop_session(self, s_hash):
"""\
@@ -207,7 +207,7 @@ class PyHocaCLI(x2go.X2goClient):
# start a new session and run a command
_desktop = self.args.share_desktop
_share_mode = self.args.share_mode
- self.logger('sharing X2go session: %s' % _desktop, loglevel=x2go.loglevel_INFO, )
+ self.logger('sharing X2Go session: %s' % _desktop, loglevel=x2go.loglevel_INFO, )
try:
self._X2goClient__share_desktop_session(s_hash, desktop=_desktop, share_mode=_share_mode)
except x2go.X2goDesktopSharingException, e:
@@ -219,7 +219,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# send a suspend request to a session
- self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, )
+ self.logger('requesting X2Go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.suspend == "ALL":
@@ -230,14 +230,14 @@ class PyHocaCLI(x2go.X2goClient):
for _session_name in _session_names:
if _session_name in available_sessions.keys():
self._X2goClient__suspend_session(s_hash, _session_name)
- self._pyhoca_logger("X2go session %s has been suspended" % _session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been suspended" % _session_name, loglevel=x2go.loglevel_NOTICE, )
else:
_server = self.args.server
_remote_ssh_port = self.args.remote_ssh_port
if not self.args.server and self.args.session_profile:
_server = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'host')
_remote_ssh_port = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'sshport')
- self._runtime_error('session %s not available on X2go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=21)
+ self._runtime_error('session %s not available on X2Go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=21)
def terminate_session(self, s_hash):
"""\
@@ -245,7 +245,7 @@ class PyHocaCLI(x2go.X2goClient):
"""
# send a terminate request to a session
- self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, loglevel=x2go.loglevel_INFO, )
+ self.logger('requesting X2Go session terminate of session: %s' % self.args.terminate, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.terminate == "ALL":
@@ -256,14 +256,14 @@ class PyHocaCLI(x2go.X2goClient):
for _session_name in _session_names:
if _session_name in available_sessions.keys():
self._X2goClient__terminate_session(s_hash, _session_name)
- self._pyhoca_logger("X2go session %s has been terminated" % _session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been terminated" % _session_name, loglevel=x2go.loglevel_NOTICE, )
else:
_server = self.args.server
_remote_ssh_port = self.args.remote_ssh_port
if not self.args.server and self.args.session_profile:
_server = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'host')
_remote_ssh_port = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'sshport')
- self._runtime_error('session %s not available on X2go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=22)
+ self._runtime_error('session %s not available on X2Go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=22)
def __init__(self, args, logger=None, liblogger=None):
"""\
@@ -277,8 +277,8 @@ class PyHocaCLI(x2go.X2goClient):
self._pyhoca_logger = copy.deepcopy(logger)
self._pyhoca_logger.tag = 'PyHocaCLI'
- # initialize the X2goClient context and start the connection to the X2go server
- self._pyhoca_logger('preparing requested X2go session', loglevel=x2go.loglevel_NOTICE, )
+ # initialize the X2goClient context and start the connection to the X2Go server
+ self._pyhoca_logger('preparing requested X2Go session', loglevel=x2go.loglevel_NOTICE, )
x2go.X2goClient.__init__(self, logger=liblogger)
@@ -310,7 +310,7 @@ class PyHocaCLI(x2go.X2goClient):
except KeyError:
kwargs[a] = v
- # setup up the session profile based X2go session
+ # setup up the session profile based X2Go session
self.x2go_session_hash = self._X2goClient__register_session(profile_name=self.args.session_profile,
known_hosts=ssh_known_hosts_filename,
**kwargs
@@ -318,7 +318,7 @@ class PyHocaCLI(x2go.X2goClient):
else:
- # setup up the manually configured X2go session
+ # setup up the manually configured X2Go session
self.x2go_session_hash = self._X2goClient__register_session(args.server, port=int(self.args.remote_ssh_port),
known_hosts=ssh_known_hosts_filename,
username=self.args.username,
@@ -398,7 +398,7 @@ class PyHocaCLI(x2go.X2goClient):
if self.args.clean_sessions:
self.clean_sessions(self.x2go_session_hash)
- # go through the possible X2go client modes
+ # go through the possible X2Go client modes
if self.args.list_sessions:
# print a beautified session list for the user
self.list_sessions(self.x2go_session_hash)
@@ -433,7 +433,7 @@ class PyHocaCLI(x2go.X2goClient):
sys.exit(0)
if self.args.resume or self.args.new:
- self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("give the X2Go session some time to come up...", loglevel=x2go.loglevel_NOTICE, )
i=0
while i < self.args.time_to_wait:
@@ -444,8 +444,8 @@ class PyHocaCLI(x2go.X2goClient):
profile_name = self._X2goClient__get_session_profile_name(self.x2go_session_hash)
session_name = self._X2goClient__get_session_name(self.x2go_session_hash)
- self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )
- self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("X2Go session is now running, the X2Go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("X2Go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, )
if self.args.share_desktop:
self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, )
elif self.args.terminate_on_ctrl_c:
@@ -466,30 +466,30 @@ class PyHocaCLI(x2go.X2goClient):
time.sleep(2)
if self._X2goClient__has_session_terminated(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif self._X2goClient__is_session_suspended(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif self._X2goClient__is_session_running(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been moved to a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, )
except KeyboardInterrupt:
if self.args.share_desktop:
- self._pyhoca_logger("Terminating X2go shared desktop session %s" % session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Terminating X2Go shared desktop session %s" % session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__terminate_session(self.x2go_session_hash)
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif self.args.terminate_on_ctrl_c:
- self._pyhoca_logger("Terminating X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Terminating X2Go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__terminate_session(self.x2go_session_hash)
# giving nxproxy's SSH tunnel some time to settle
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
else:
- self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Suspending X2Go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__suspend_session(self.x2go_session_hash)
# giving nxproxy's SSH tunnel some time to settle
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2Go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
except x2go.X2goSessionException, e:
self._pyhoca_logger("X2goSessionException occured:", loglevel=x2go.loglevel_ERROR)
diff --git a/setup.py b/setup.py
index e4f18c1..204f8d7 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ import pyhoca.cli
setup(
name = "PyHoca CLI",
version = pyhoca.cli.__VERSION__,
- description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux) X2go client for the command line.",
+ description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.",
license = 'GPL',
author = 'Mike Gabriel',
url = 'http://www.x2go.org',
hooks/post-receive
--
pyhoca-cli.git (Python X2Go Client (command line client))
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 "pyhoca-cli.git" (Python X2Go Client (command line client)).
1
0
31 Jan '12
The branch, master has been updated
via f1c7968561910d353638708bb8ce4eb93c68cc7c (commit)
from 0d2b0325fc8ba69472eba44a0cbc12efcb99ce72 (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 f1c7968561910d353638708bb8ce4eb93c68cc7c
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Jan 31 23:34:12 2012 +0100
Replace non-code string ,,X2go'' by ,,X2Go''.
-----------------------------------------------------------------------
Summary of changes:
README.i18n | 4 +-
debian/changelog | 25 +++++++------
desktop/pyhoca-gui.desktop | 2 +-
man/man1/pyhoca-gui.1 | 22 ++++++------
po/bg.po | 36 ++++++++++----------
po/de.po | 74 ++++++++++++++++++++--------------------
po/en.po | 70 +++++++++++++++++++-------------------
po/es.po | 58 +++++++++++++++---------------
po/nl.po | 70 +++++++++++++++++++-------------------
po/pyhoca-gui.pot | 36 ++++++++++----------
pyhoca-gui | 12 +++---
pyhoca/wxgui/frontend.py | 38 ++++++++++----------
pyhoca/wxgui/logon.py | 2 +-
pyhoca/wxgui/messages.py | 2 +-
pyhoca/wxgui/profilemanager.py | 2 +-
pyhoca/wxgui/taskbar.py | 6 ++--
setup.py | 2 +-
17 files changed, 231 insertions(+), 230 deletions(-)
The diff of changes is:
diff --git a/README.i18n b/README.i18n
index 0d6dd54..a10c2e6 100644
--- a/README.i18n
+++ b/README.i18n
@@ -11,7 +11,7 @@ The translation files can be found in the /po folder of this source project.
New team member --- new language for PyHoca-GUI
-----------------------------------------------
If you are a new member in the x2go-i18n team, the first we say is: WELCOME!!! and
-THANKS!!! for the time you give to the X2go project.
+THANKS!!! for the time you give to the X2Go project.
And, if you are new to the team and language files for the language you want to feel
responsible for do not yet exist, please subscribe to this mailing list first:
@@ -30,7 +30,7 @@ folder.
Git cloning
-----------
-Next thing to do is to obtained the latest sources from X2go Git.
+Next thing to do is to obtained the latest sources from X2Go Git.
$ # git needs to be installed, on Debian/Ubuntu this is
$ aptitude install git
diff --git a/debian/changelog b/debian/changelog
index b6dcc16..584c99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low
- Add icons folder ,,icons_symlinked'' for people who will package
PyHoca-GUI on Debian or other Distros that also ship the
gnome-colors-common icon theme.
+ - Replace non-code string ,,X2go'' by ,,X2Go''.
* Depend on Python X2Go 0.1.1.9.
* Install GNOME icons via dh_links.
* Install X2Go icons with explicit install paths.
@@ -54,7 +55,7 @@ pyhoca-gui (0.1.0.9-0~x2go1) unstable; urgency=low
- Add submenu support for sharing non-auto-connected shared folders.
- Only offer foldering sharing in menus if server provides it.
- Add error message in case logon fails due to a missing home directory on
- the remote X2go server.
+ the remote X2Go server.
- Spanish i18n update.
- Dutch i18n update.
- Update of README.i18n.
@@ -86,7 +87,7 @@ pyhoca-gui (0.1.0.7-0~x2go1) unstable; urgency=low
- On no such command errors, detect if we already have a session_name. If
not, leave it out in the GUI notification.
- Add HOOK_session_startup_failed as a GUI notification (was: exception
- raisure), requires Python X2go >= 0.1.1.5.
+ raisure), requires Python X2Go >= 0.1.1.5.
- Provide complete list of compression methods, profile manager GUI
improved.
- Fix for usekbd session profile option, it was misinterpreted before...
@@ -101,8 +102,8 @@ pyhoca-gui (0.1.0.6-0~x2go1) unstable; urgency=low
- i18n fixes
- README/TODO update.
- Handle X2goSession failures (SFTP open) during authentication.
- * Properly depend on Python X2go package.
- * Depend on Python X2go 0.1.1.3.
+ * Properly depend on Python X2Go package.
+ * Depend on Python X2Go 0.1.1.3.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 06 Jul 2011 22:13:14 +0200
@@ -122,7 +123,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) unstable; urgency=low
- Update i18n (en, de, nl).
- Fix session auto-connecting.
* React to bug #627990, prefer man2html-base over man2html.
- * Depend on Python X2go 0.1.1.2
+ * Depend on Python X2Go 0.1.1.2
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 13:55:42 +0200
@@ -142,7 +143,7 @@ pyhoca-gui (0.1.0.3-0~x2go1) unstable; urgency=low
- Release session name on connection errors when greyed out.
- Spawn initial list sessions call into background to unblock I/O
during/after authentication.
- * Depend on Python X2go 0.1.1.0.
+ * Depend on Python X2Go 0.1.1.0.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 23 Jun 2011 00:45:34 +0200
@@ -157,7 +158,7 @@ pyhoca-gui (0.1.0.1-0~x2go1) unstable; urgency=low
* new upstream release (0.1.0.1):
- fixes session profile menus
- * depends on Python X2go 0.1.0.2
+ * depends on Python X2Go 0.1.0.2
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 31 May 2011 14:40:51 +0200
@@ -185,7 +186,7 @@ pyhoca-gui (0.0.34.1-0~x2go1) unstable; urgency=low
* new upstream version (0.0.34.1):
- minor fixes
- * depends on new Python X2go release
+ * depends on new Python X2Go release
* adds html version of man page in doc folder
* minor fixes in upstream code
@@ -328,7 +329,7 @@ pyhoca-gui (0.0.23-0~nwt1) lucid maverick testing unstable; urgency=low
pyhoca-gui (0.0.22-0~nwt1) lucid maverick testing unstable; urgency=low
- * bugfix for error reporting when a non-X2go user authenticates
+ * bugfix for error reporting when a non-X2Go user authenticates
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Wed, 12 Jan 2011 00:35:00 +0100
@@ -388,13 +389,13 @@ pyhoca-gui (0.0.17-0~nwt1) lucid maverick testing unstable; urgency=low
pyhoca-gui (0.0.16-0~nwt3) lucid maverick testing unstable; urgency=low
- * updated Python X2go dependency
+ * updated Python X2Go dependency
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 01:05:00 +0100
pyhoca-gui (0.0.16-0~nwt2) lucid maverick testing unstable; urgency=low
- * updated Python X2go dependency
+ * updated Python X2Go dependency
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 00:30:00 +0100
@@ -460,7 +461,7 @@ pyhoca-gui (0.0.11-0~nwt1) lucid maverick testing unstable; urgency=low
pyhoca-gui (0.0.10-0~nwt1) lucid maverick testing unstable; urgency=low
- * depending on Python X2go 0.0.22
+ * depending on Python X2Go 0.0.22
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:40:00 +0100
diff --git a/desktop/pyhoca-gui.desktop b/desktop/pyhoca-gui.desktop
index 0fcee16..575c623 100644
--- a/desktop/pyhoca-gui.desktop
+++ b/desktop/pyhoca-gui.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=PyHoca-GUI
GenericName=PyHoca-GUI
-Comment=Python X2go Client Applet
+Comment=Python X2Go Client Applet
Exec=pyhoca-gui
Icon=pyhoca_x2go-logo-ubuntu
X-Window-Icon=pyhoca_x2go-logo-ubuntu
diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1
index edc783b..ed90d24 100644
--- a/man/man1/pyhoca-gui.1
+++ b/man/man1/pyhoca-gui.1
@@ -5,9 +5,9 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH pyhoca-gui 1 "26 May 2011" "Version 0.1.0.x" "X2go Application"
+.TH pyhoca-gui 1 "26 May 2011" "Version 0.1.0.x" "X2Go Application"
.SH NAME
-pyhoca-gui \- graphical X2go client applet written in Python
+pyhoca-gui \- graphical X2Go client applet written in Python
.SH SYNOPSIS
'nh
.fi
@@ -22,17 +22,17 @@ pyhoca-gui \- graphical X2go client applet written in Python
.ad b
'hy
.SH DESCRIPTION
-\fBpyhoca-gui\fR is a cross-platform (Windows, MacOS X, Linux) graphical X2go client applet that
+\fBpyhoca-gui\fR is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client applet that
docks to your desktop's system tray.
.PP
-From your desktop's system tray you can start/resume/share pre-configured X2go sessions. You can manage the
-pre-configured session profiles in the X2go profile manager and also configure the basic setup of
+From your desktop's system tray you can start/resume/share pre-configured X2Go sessions. You can manage the
+pre-configured session profiles in the X2Go profile manager and also configure the basic setup of
\fBpyhoca-gui\fR.
.PP
\fBpyhoca-gui\fR uses the same set of config files (\fBsettings\fR, \fBprinting\fR and \fBsessions\fR in ~/.x2goclient) as the original
-X2go Client application (by Heinz-M. Graesing and Oleksandr Schneyder) does.
+X2Go Client application (by Heinz-M. Graesing and Oleksandr Schneyder) does.
.PP
-On Windows systems \fBpyhoca-gui\fR uses the same set of Windows registry keys and values as the original X2go Client application.
+On Windows systems \fBpyhoca-gui\fR uses the same set of Windows registry keys and values as the original X2Go Client application.
.PP
See the included README and TODO for further information on \fBpyhoca-gui\fR.
.SH COMMON OPTIONS
@@ -51,7 +51,7 @@ No output to stdout at all! Use this option on Windows!!!
Enable debugging output.
.TP
\*(T<\fB\-\-libdebug\fR\*(T>
-Enable debugging code of the unterlying Python X2go module.
+Enable debugging code of the unterlying Python X2Go module.
.TP
\*(T<\fB\-\-libdebug-sftpxfer\fR\*(T>
Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data).
@@ -131,7 +131,7 @@ Give a custom position for the logon window, use negative values to position rel
FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend
on all platforms.
.PP
-For client-server communication the only yet implemented backend is the STDOUT backend (as X2go server commands
+For client-server communication the only yet implemented backend is the STDOUT backend (as X2Go server commands
print their execution results to /dev/stdout. (But other communication backends might be possible in the future...).
.PP
In the same way we are focusing on a successor of the current NX3 agent/proxy tool. A change in the proxy backend
@@ -184,7 +184,7 @@ Start either of the currently supported XServers: Xming, Cygwin-X -- make sure y
on your system.
.TP
\*(T<\fB\-\-start-pulseaudio\fR\*(T>
-Start the PulseAudio server before starting \fBpyhoca-gui\fR. This option is needed to get X2go audio working. However, it is
+Start the PulseAudio server before starting \fBpyhoca-gui\fR. This option is needed to get X2Go audio working. However, it is
not enabled by default.
.TP
\*(T<\fB\-\-lang [en|de|nl|es]\fR\*(T>
@@ -192,5 +192,5 @@ Select the GUI language.
.SH "SEE ALSO"
\fB/usr/share/doc/pyhoca-gui\fR
.SH AUTHOR
-This manual has been written for the X2go project by
+This manual has been written for the X2Go project by
Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>.
diff --git a/po/bg.po b/po/bg.po
index 2041d48..8da6cd8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -63,7 +63,7 @@ msgid "%s - connect failure"
msgstr ""
#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:365
-msgid "User is not allowed to start X2go sessions!"
+msgid "User is not allowed to start X2Go sessions!"
msgstr ""
#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:372
@@ -145,19 +145,19 @@ msgstr ""
#, python-format
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
#: ../pyhoca/wxgui/taskbar.py:87
msgid ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
+"Connecting you to X2Go..."
msgstr ""
#: ../pyhoca/wxgui/taskbar.py:90
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:73
@@ -434,7 +434,7 @@ msgstr ""
msgid "Pulse Audio"
msgstr ""
-#. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
#: ../pyhoca/wxgui/profilemanager.py:250
msgid "Arts (not supported)"
@@ -777,7 +777,7 @@ msgid "An unknown error occurred during authentication!"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:569
-msgid "Cleaning X2go sessions..."
+msgid "Cleaning X2Go sessions..."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:588
@@ -786,7 +786,7 @@ msgid "%s - disconnect"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:588
-msgid "X2go Profile is now disconnected."
+msgid "X2Go Profile is now disconnected."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:604
@@ -850,13 +850,13 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:794
#, python-format
-msgid "The command ,,%s'' is not available on X2go server."
+msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:796
#, python-format
msgid ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
@@ -886,7 +886,7 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:820
msgid ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:823 ../pyhoca/wxgui/frontend.py:826
@@ -895,11 +895,11 @@ msgid "%s - audio error"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:823
-msgid "The X2go PulseAudio system could not be started."
+msgid "The X2Go PulseAudio system could not be started."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:826
-msgid "The X2go PulseAudio system has died unexpectedly."
+msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:829
@@ -943,14 +943,14 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:849
#, python-format
msgid ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:853
#, python-format
msgid ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
msgstr ""
@@ -962,14 +962,14 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:857
#, python-format
msgid ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:861
#, python-format
msgid ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
msgstr ""
@@ -993,7 +993,7 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:869
#, python-format
msgid ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:885
#, python-format
msgid ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
msgstr ""
diff --git a/po/de.po b/po/de.po
index e467b62..81d8ad9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -62,8 +62,8 @@ msgid "%s - connect failure"
msgstr "%s - Verbindung fehlgeschlagen"
#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:365
-msgid "User is not allowed to start X2go sessions!"
-msgstr "Benutzer darf keine X2go Sitzungen starten!"
+msgid "User is not allowed to start X2Go sessions!"
+msgstr "Benutzer darf keine X2Go Sitzungen starten!"
#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:372
#, python-format
@@ -109,7 +109,7 @@ msgstr "%s - ungültiger Server-Schlüssel"
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-"Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer "
+"Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer "
"nicht akzeptiert"
#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:440
@@ -149,24 +149,24 @@ msgstr ""
#, python-format
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Verbindungsaufbau zu X2go Server ,,%s'' läuft"
+"Verbindungsaufbau zu X2Go Server ,,%s'' läuft"
#: ../pyhoca/wxgui/taskbar.py:87
msgid ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
-msgstr "Verbinden mit X2go Server..."
+"Connecting you to X2Go..."
+msgstr "Verbinden mit X2Go Server..."
#: ../pyhoca/wxgui/taskbar.py:90
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Verbindungen zu entferntem X2go Server aufbauen"
+"Verbindungen zu entferntem X2Go Server aufbauen"
#: ../pyhoca/wxgui/profilemanager.py:73
msgid "GNOME Desktop (GNOME)"
@@ -442,7 +442,7 @@ msgstr "Audiounterstützung aktivieren"
msgid "Pulse Audio"
msgstr "Pulse Audio"
-#. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
#: ../pyhoca/wxgui/profilemanager.py:250
msgid "Arts (not supported)"
@@ -793,8 +793,8 @@ msgid "An unknown error occurred during authentication!"
msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
#: ../pyhoca/wxgui/frontend.py:569
-msgid "Cleaning X2go sessions..."
-msgstr "Beende X2go Sitzungen..."
+msgid "Cleaning X2Go sessions..."
+msgstr "Beende X2Go Sitzungen..."
#: ../pyhoca/wxgui/frontend.py:588
#, python-format
@@ -802,8 +802,8 @@ msgid "%s - disconnect"
msgstr "%s - trennen"
#: ../pyhoca/wxgui/frontend.py:588
-msgid "X2go Profile is now disconnected."
-msgstr "X2go Profil ist nun nicht mehr verbunden."
+msgid "X2Go Profile is now disconnected."
+msgstr "X2Go Profil ist nun nicht mehr verbunden."
#: ../pyhoca/wxgui/frontend.py:604
msgid "New Session Profile"
@@ -872,16 +872,16 @@ msgstr "Der Start der Sitzung ist fehlgeschlagen."
#: ../pyhoca/wxgui/frontend.py:794
#, python-format
-msgid "The command ,,%s'' is not available on X2go server."
-msgstr "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar."
+msgid "The command ,,%s'' is not available on X2Go server."
+msgstr "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar."
#: ../pyhoca/wxgui/frontend.py:796
#, python-format
msgid ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-"Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n"
+"Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:802
@@ -896,7 +896,7 @@ msgid ""
"been denied."
msgstr ""
"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s "
-"wurde vom X2go Server abgelehnt."
+"wurde vom X2Go Server abgelehnt."
#: ../pyhoca/wxgui/frontend.py:808
#, python-format
@@ -914,9 +914,9 @@ msgstr "%s - Warnung Audiosystem"
#: ../pyhoca/wxgui/frontend.py:820
msgid ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-"Das X2go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht "
+"Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht "
"verfügbar."
#: ../pyhoca/wxgui/frontend.py:823 ../pyhoca/wxgui/frontend.py:826
@@ -925,12 +925,12 @@ msgid "%s - audio error"
msgstr "%s - Audiofehler"
#: ../pyhoca/wxgui/frontend.py:823
-msgid "The X2go PulseAudio system could not be started."
-msgstr "Das X2go PulseAudio System konnte nicht gestartet werden."
+msgid "The X2Go PulseAudio system could not be started."
+msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden."
#: ../pyhoca/wxgui/frontend.py:826
-msgid "The X2go PulseAudio system has died unexpectedly."
-msgstr "Das X2go PulseAudio System ist soeben abgestürzt."
+msgid "The X2Go PulseAudio system has died unexpectedly."
+msgstr "Das X2Go PulseAudio System ist soeben abgestürzt."
#: ../pyhoca/wxgui/frontend.py:829
#, python-format
@@ -981,19 +981,19 @@ msgstr "%s - starten"
#: ../pyhoca/wxgui/frontend.py:849
#, python-format
msgid ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
msgstr ""
-"Neue X2go Sitzung wird gestartet...\n"
+"Neue X2Go Sitzung wird gestartet...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:853
#, python-format
msgid ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
msgstr ""
-"Ein anderes X2go Programm hat diese Sitzung gestartet\n"
+"Ein anderes X2Go Programm hat diese Sitzung gestartet\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:857 ../pyhoca/wxgui/frontend.py:861
@@ -1004,19 +1004,19 @@ msgstr "%s - fortsetzen"
#: ../pyhoca/wxgui/frontend.py:857
#, python-format
msgid ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
msgstr ""
-"X2go Sitzung wird fortgesetzt...\n"
+"X2Go Sitzung wird fortgesetzt...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:861
#, python-format
msgid ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
msgstr ""
-"Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n"
+"Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:865
@@ -1041,10 +1041,10 @@ msgstr "%s - anhalten"
#: ../pyhoca/wxgui/frontend.py:869
#, python-format
msgid ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
msgstr ""
-"X2go Sitzung wurde angehalten\n"
+"X2Go Sitzung wurde angehalten\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:885
@@ -1055,10 +1055,10 @@ msgstr "%s - beenden"
#: ../pyhoca/wxgui/frontend.py:885
#, python-format
msgid ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
msgstr ""
-"X2go Sitzung wurde beendet\n"
+"X2Go Sitzung wurde beendet\n"
"%s"
#: ../pyhoca/wxgui/messages.py:53
diff --git a/po/en.po b/po/en.po
index 4dee5a2..c6d5410 100644
--- a/po/en.po
+++ b/po/en.po
@@ -62,8 +62,8 @@ msgid "%s - connect failure"
msgstr "%s - connect failure"
#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:365
-msgid "User is not allowed to start X2go sessions!"
-msgstr "User is not allowed to start X2go sessions!"
+msgid "User is not allowed to start X2Go sessions!"
+msgstr "User is not allowed to start X2Go sessions!"
#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:372
#, python-format
@@ -147,26 +147,26 @@ msgstr ""
#, python-format
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
#: ../pyhoca/wxgui/taskbar.py:87
msgid ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
+"Connecting you to X2Go..."
msgstr ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
+"Connecting you to X2Go..."
#: ../pyhoca/wxgui/taskbar.py:90
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
#: ../pyhoca/wxgui/profilemanager.py:73
msgid "GNOME Desktop (GNOME)"
@@ -442,7 +442,7 @@ msgstr "Enable sound support"
msgid "Pulse Audio"
msgstr "Pulse Audio"
-#. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
#: ../pyhoca/wxgui/profilemanager.py:250
msgid "Arts (not supported)"
@@ -789,8 +789,8 @@ msgid "An unknown error occurred during authentication!"
msgstr "An unknown error occurred during authentication!"
#: ../pyhoca/wxgui/frontend.py:569
-msgid "Cleaning X2go sessions..."
-msgstr "Cleaning X2go sessions..."
+msgid "Cleaning X2Go sessions..."
+msgstr "Cleaning X2Go sessions..."
#: ../pyhoca/wxgui/frontend.py:588
#, python-format
@@ -798,8 +798,8 @@ msgid "%s - disconnect"
msgstr "%s - disconnect"
#: ../pyhoca/wxgui/frontend.py:588
-msgid "X2go Profile is now disconnected."
-msgstr "X2go Profile is now disconnected."
+msgid "X2Go Profile is now disconnected."
+msgstr "X2Go Profile is now disconnected."
#: ../pyhoca/wxgui/frontend.py:604
msgid "New Session Profile"
@@ -868,16 +868,16 @@ msgstr "The session startup failed."
#: ../pyhoca/wxgui/frontend.py:794
#, python-format
-msgid "The command ,,%s'' is not available on X2go server."
-msgstr "The command ,,%s'' is not available on X2go server."
+msgid "The command ,,%s'' is not available on X2Go server."
+msgstr "The command ,,%s'' is not available on X2Go server."
#: ../pyhoca/wxgui/frontend.py:796
#, python-format
msgid ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
#: ../pyhoca/wxgui/frontend.py:802
@@ -910,9 +910,9 @@ msgstr "%s - audio warning"
#: ../pyhoca/wxgui/frontend.py:820
msgid ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
#: ../pyhoca/wxgui/frontend.py:823 ../pyhoca/wxgui/frontend.py:826
#, python-format
@@ -920,12 +920,12 @@ msgid "%s - audio error"
msgstr "%s - audio error"
#: ../pyhoca/wxgui/frontend.py:823
-msgid "The X2go PulseAudio system could not be started."
-msgstr "The X2go PulseAudio system could not be started."
+msgid "The X2Go PulseAudio system could not be started."
+msgstr "The X2Go PulseAudio system could not be started."
#: ../pyhoca/wxgui/frontend.py:826
-msgid "The X2go PulseAudio system has died unexpectedly."
-msgstr "The X2go PulseAudio system has died unexpectedly."
+msgid "The X2Go PulseAudio system has died unexpectedly."
+msgstr "The X2Go PulseAudio system has died unexpectedly."
#: ../pyhoca/wxgui/frontend.py:829
#, python-format
@@ -976,19 +976,19 @@ msgstr "%s - start"
#: ../pyhoca/wxgui/frontend.py:849
#, python-format
msgid ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
msgstr ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:853
#, python-format
msgid ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
msgstr ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:857 ../pyhoca/wxgui/frontend.py:861
@@ -999,19 +999,19 @@ msgstr "%s - resume"
#: ../pyhoca/wxgui/frontend.py:857
#, python-format
msgid ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
msgstr ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:861
#, python-format
msgid ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
msgstr ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:865
@@ -1036,10 +1036,10 @@ msgstr "%s - suspend"
#: ../pyhoca/wxgui/frontend.py:869
#, python-format
msgid ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
msgstr ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:885
@@ -1050,10 +1050,10 @@ msgstr "%s - terminate"
#: ../pyhoca/wxgui/frontend.py:885
#, python-format
msgid ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
msgstr ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
#: ../pyhoca/wxgui/messages.py:53
diff --git a/po/es.po b/po/es.po
index 58abce0..9917267 100644
--- a/po/es.po
+++ b/po/es.po
@@ -65,7 +65,7 @@ msgid "%s - connect failure"
msgstr "%s - fallo en la conexión"
#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:365
-msgid "User is not allowed to start X2go sessions!"
+msgid "User is not allowed to start X2Go sessions!"
msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!"
#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:372
@@ -152,23 +152,23 @@ msgstr ""
#, python-format
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Conectándote a tu servidor X2go \"%s''"
+"Conectándote a tu servidor X2Go \"%s''"
#: ../pyhoca/wxgui/taskbar.py:87
msgid ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
+"Connecting you to X2Go..."
msgstr ""
"PyHoca-GUI\n"
-"Conectándote a X2go..."
+"Conectándote a X2Go..."
#: ../pyhoca/wxgui/taskbar.py:90
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
"Cliente para conexiones remotas a servidores X2go"
@@ -451,7 +451,7 @@ msgstr "Activar soporte de sonido"
msgid "Pulse Audio"
msgstr "Pulse Audio"
-#. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
#: ../pyhoca/wxgui/profilemanager.py:250
msgid "Arts (not supported)"
@@ -808,8 +808,8 @@ msgstr ""
"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!"
#: ../pyhoca/wxgui/frontend.py:569
-msgid "Cleaning X2go sessions..."
-msgstr "Limpiando sesiones X2go..."
+msgid "Cleaning X2Go sessions..."
+msgstr "Limpiando sesiones X2Go..."
#: ../pyhoca/wxgui/frontend.py:588
#, python-format
@@ -817,8 +817,8 @@ msgid "%s - disconnect"
msgstr "%s - desconectado"
#: ../pyhoca/wxgui/frontend.py:588
-msgid "X2go Profile is now disconnected."
-msgstr "Se ha desconectado el Perfil X2go."
+msgid "X2Go Profile is now disconnected."
+msgstr "Se ha desconectado el Perfil X2Go."
#: ../pyhoca/wxgui/frontend.py:604
msgid "New Session Profile"
@@ -887,13 +887,13 @@ msgstr "El inicio de sesión ha fallado"
#: ../pyhoca/wxgui/frontend.py:794
#, python-format
-msgid "The command ,,%s'' is not available on X2go server."
-msgstr "El comando \"%s'' no está presente en el servidor X2go."
+msgid "The command ,,%s'' is not available on X2Go server."
+msgstr "El comando \"%s'' no está presente en el servidor X2Go."
#: ../pyhoca/wxgui/frontend.py:796
#, python-format
msgid ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
"El comando ,,%s'' no está presente en el servidor X2go\n"
@@ -911,7 +911,7 @@ msgid ""
"been denied."
msgstr ""
"Se ha denegado la redirección del túnel TCP inverso para la sesión %s al "
-"puerto %s del servidor X2go."
+"puerto %s del servidor X2Go."
#: ../pyhoca/wxgui/frontend.py:808
#, python-format
@@ -929,9 +929,9 @@ msgstr "%s - advertencia en el sistema de audio"
#: ../pyhoca/wxgui/frontend.py:820
msgid ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-"El sistema X2go PulseAudio no está disponible en las sesiones del tipo "
+"El sistema X2Go PulseAudio no está disponible en las sesiones del tipo "
"Remote Desktop"
#: ../pyhoca/wxgui/frontend.py:823 ../pyhoca/wxgui/frontend.py:826
@@ -940,12 +940,12 @@ msgid "%s - audio error"
msgstr "%s - error en el audio"
#: ../pyhoca/wxgui/frontend.py:823
-msgid "The X2go PulseAudio system could not be started."
-msgstr "El sistema X2go PulseAudio no puede iniciarse"
+msgid "The X2Go PulseAudio system could not be started."
+msgstr "El sistema X2Go PulseAudio no puede iniciarse"
#: ../pyhoca/wxgui/frontend.py:826
-msgid "The X2go PulseAudio system has died unexpectedly."
-msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente"
+msgid "The X2Go PulseAudio system has died unexpectedly."
+msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente"
#: ../pyhoca/wxgui/frontend.py:829
#, python-format
@@ -996,16 +996,16 @@ msgstr "%s - inicio"
#: ../pyhoca/wxgui/frontend.py:849
#, python-format
msgid ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
msgstr ""
-"Iniciando nueva sesión X2go...\n"
+"Iniciando nueva sesión X2Go...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:853
#, python-format
msgid ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
msgstr ""
"Otro cliente ha iniciado sesión X2go\n"
@@ -1019,16 +1019,16 @@ msgstr "%s - retornar a la sesión"
#: ../pyhoca/wxgui/frontend.py:857
#, python-format
msgid ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
msgstr ""
-"Retornando sesión X2go...\n"
+"Retornando sesión X2Go...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:861
#, python-format
msgid ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
msgstr ""
"Otro cliente retornó a la sesión X2go\n"
@@ -1056,7 +1056,7 @@ msgstr "%s - suspender"
#: ../pyhoca/wxgui/frontend.py:869
#, python-format
msgid ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
msgstr ""
"Se ha suspendido la Sesión X2go\n"
@@ -1070,7 +1070,7 @@ msgstr "%s - finalizar"
#: ../pyhoca/wxgui/frontend.py:885
#, python-format
msgid ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
msgstr ""
"Se ha finalizado la sesión X2go\n"
diff --git a/po/nl.po b/po/nl.po
index a503e0a..92b6de5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -62,8 +62,8 @@ msgid "%s - connect failure"
msgstr "%s - verbinden mislukt"
#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:365
-msgid "User is not allowed to start X2go sessions!"
-msgstr "Gebruiker mag geen X2go sessie starten!"
+msgid "User is not allowed to start X2Go sessions!"
+msgstr "Gebruiker mag geen X2Go sessie starten!"
#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:372
#, python-format
@@ -148,24 +148,24 @@ msgstr ""
#, python-format
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Verbinding met X2go server ,,%s'' wordt gemaakt"
+"Verbinding met X2Go server ,,%s'' wordt gemaakt"
#: ../pyhoca/wxgui/taskbar.py:87
msgid ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
-msgstr "Bezig je te verbinden met X2go ..."
+"Connecting you to X2Go..."
+msgstr "Bezig je te verbinden met X2Go ..."
#: ../pyhoca/wxgui/taskbar.py:90
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
msgstr ""
"PyHoca-GUI (Python X2goClient)\n"
-"Verbinding met remote X2go server aan het opbouwen"
+"Verbinding met remote X2Go server aan het opbouwen"
#: ../pyhoca/wxgui/profilemanager.py:73
msgid "GNOME Desktop (GNOME)"
@@ -445,7 +445,7 @@ msgstr "Geluid gebruiken"
msgid "Pulse Audio"
msgstr "Pulse Audio"
-#. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
#: ../pyhoca/wxgui/profilemanager.py:250
msgid "Arts (not supported)"
@@ -796,8 +796,8 @@ msgid "An unknown error occurred during authentication!"
msgstr "Een onbekende fout is bij de authenticatie opgetreden"
#: ../pyhoca/wxgui/frontend.py:569
-msgid "Cleaning X2go sessions..."
-msgstr "Opschonen X2go sessies..."
+msgid "Cleaning X2Go sessions..."
+msgstr "Opschonen X2Go sessies..."
#: ../pyhoca/wxgui/frontend.py:588
#, python-format
@@ -805,8 +805,8 @@ msgid "%s - disconnect"
msgstr "%s - verbinding verbreken"
#: ../pyhoca/wxgui/frontend.py:588
-msgid "X2go Profile is now disconnected."
-msgstr "X2go Profiel is nu niet meer verbonden."
+msgid "X2Go Profile is now disconnected."
+msgstr "X2Go Profiel is nu niet meer verbonden."
#: ../pyhoca/wxgui/frontend.py:604
msgid "New Session Profile"
@@ -875,16 +875,16 @@ msgstr "Opstarten van de sessie is mislukt"
#: ../pyhoca/wxgui/frontend.py:794
#, python-format
-msgid "The command ,,%s'' is not available on X2go server."
-msgstr "Het commando ,,%s'' is niet beschikbaar op de X2go server."
+msgid "The command ,,%s'' is not available on X2Go server."
+msgstr "Het commando ,,%s'' is niet beschikbaar op de X2Go server."
#: ../pyhoca/wxgui/frontend.py:796
#, python-format
msgid ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-"Het commando ,,%s'' is niet beschikbaar op de X2go server\n"
+"Het commando ,,%s'' is niet beschikbaar op de X2Go server\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:802
@@ -917,9 +917,9 @@ msgstr "%s - audio waarschuwing"
#: ../pyhoca/wxgui/frontend.py:820
msgid ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-"Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies"
+"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies"
#: ../pyhoca/wxgui/frontend.py:823 ../pyhoca/wxgui/frontend.py:826
#, python-format
@@ -927,12 +927,12 @@ msgid "%s - audio error"
msgstr "%s - audio fout"
#: ../pyhoca/wxgui/frontend.py:823
-msgid "The X2go PulseAudio system could not be started."
-msgstr "Het X2go PulseAudio systeem kon niet gestart worden"
+msgid "The X2Go PulseAudio system could not be started."
+msgstr "Het X2Go PulseAudio systeem kon niet gestart worden"
#: ../pyhoca/wxgui/frontend.py:826
-msgid "The X2go PulseAudio system has died unexpectedly."
-msgstr "Het X2go PulseAudio systeem is gecrashed"
+msgid "The X2Go PulseAudio system has died unexpectedly."
+msgstr "Het X2Go PulseAudio systeem is gecrashed"
#: ../pyhoca/wxgui/frontend.py:829
#, python-format
@@ -983,19 +983,19 @@ msgstr "%s - Start"
#: ../pyhoca/wxgui/frontend.py:849
#, python-format
msgid ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
msgstr ""
-"Nieuwe X2go sessie wordt gestart...\n"
+"Nieuwe X2Go sessie wordt gestart...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:853
#, python-format
msgid ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
msgstr ""
-"Een andere X2go-client heeft deze sessie gestart\n"
+"Een andere X2Go-client heeft deze sessie gestart\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:857 ../pyhoca/wxgui/frontend.py:861
@@ -1006,19 +1006,19 @@ msgstr "%s - hervatten"
#: ../pyhoca/wxgui/frontend.py:857
#, python-format
msgid ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
msgstr ""
-"X2go Sessie wordt hervat...\n"
+"X2Go Sessie wordt hervat...\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:861
#, python-format
msgid ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
msgstr ""
-"Een andere X2go-client heeft de Sessie hervat\n"
+"Een andere X2Go-client heeft de Sessie hervat\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:865
@@ -1043,10 +1043,10 @@ msgstr "%s - suspend"
#: ../pyhoca/wxgui/frontend.py:869
#, python-format
msgid ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
msgstr ""
-"X2go Sessie is suspended\n"
+"X2Go Sessie is suspended\n"
"%s"
#: ../pyhoca/wxgui/frontend.py:885
@@ -1057,10 +1057,10 @@ msgstr "%s - beëindigen"
#: ../pyhoca/wxgui/frontend.py:885
#, python-format
msgid ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
msgstr ""
-"X2go Sessie wordt beëindigd\n"
+"X2Go Sessie wordt beëindigd\n"
"%s"
#: ../pyhoca/wxgui/messages.py:53
diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot
index 0a9cd43..888e165 100644
--- a/po/pyhoca-gui.pot
+++ b/po/pyhoca-gui.pot
@@ -59,7 +59,7 @@ msgid "%s - connect failure"
msgstr ""
#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:365
-msgid "User is not allowed to start X2go sessions!"
+msgid "User is not allowed to start X2Go sessions!"
msgstr ""
#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:372
@@ -141,19 +141,19 @@ msgstr ""
#, python-format
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Currently connecting you to remote X2go server ,,%s''"
+"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
#: ../pyhoca/wxgui/taskbar.py:87
msgid ""
"PyHoca-GUI\n"
-"Connecting you to X2go..."
+"Connecting you to X2Go..."
msgstr ""
#: ../pyhoca/wxgui/taskbar.py:90
msgid ""
"PyHoca-GUI (Python X2goClient)\n"
-"Client for connecting you to a remote X2go server"
+"Client for connecting you to a remote X2Go server"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:73
@@ -430,7 +430,7 @@ msgstr ""
msgid "Pulse Audio"
msgstr ""
-#. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
#: ../pyhoca/wxgui/profilemanager.py:250
msgid "Arts (not supported)"
@@ -773,7 +773,7 @@ msgid "An unknown error occurred during authentication!"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:569
-msgid "Cleaning X2go sessions..."
+msgid "Cleaning X2Go sessions..."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:588
@@ -782,7 +782,7 @@ msgid "%s - disconnect"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:588
-msgid "X2go Profile is now disconnected."
+msgid "X2Go Profile is now disconnected."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:604
@@ -846,13 +846,13 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:794
#, python-format
-msgid "The command ,,%s'' is not available on X2go server."
+msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:796
#, python-format
msgid ""
-"The command ,,%s'' is not available on X2go server\n"
+"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
@@ -882,7 +882,7 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:820
msgid ""
-"The X2go PulseAudio system is not available within Remote Desktop sessions."
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:823 ../pyhoca/wxgui/frontend.py:826
@@ -891,11 +891,11 @@ msgid "%s - audio error"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:823
-msgid "The X2go PulseAudio system could not be started."
+msgid "The X2Go PulseAudio system could not be started."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:826
-msgid "The X2go PulseAudio system has died unexpectedly."
+msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
#: ../pyhoca/wxgui/frontend.py:829
@@ -939,14 +939,14 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:849
#, python-format
msgid ""
-"New X2go session starting up...\n"
+"New X2Go session starting up...\n"
"%s"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:853
#, python-format
msgid ""
-"Another client started X2go session\n"
+"Another client started X2Go session\n"
"%s"
msgstr ""
@@ -958,14 +958,14 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:857
#, python-format
msgid ""
-"Resuming X2go session...\n"
+"Resuming X2Go session...\n"
"%s"
msgstr ""
#: ../pyhoca/wxgui/frontend.py:861
#, python-format
msgid ""
-"Another client resumed X2go session\n"
+"Another client resumed X2Go session\n"
"%s"
msgstr ""
@@ -989,7 +989,7 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:869
#, python-format
msgid ""
-"X2go Session has been suspended\n"
+"X2Go Session has been suspended\n"
"%s"
msgstr ""
@@ -1001,7 +1001,7 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:885
#, python-format
msgid ""
-"X2go Session has terminated\n"
+"X2Go Session has terminated\n"
"%s"
msgstr ""
diff --git a/pyhoca-gui b/pyhoca-gui
index 2052b38..01e6ad2 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -65,14 +65,14 @@ else:
from pyhoca.wxgui.basepath import locale_basepath
-# Python X2go modules
+# Python X2Go modules
from x2go import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
if _X2GOCLIENT_OS == 'Windows':
from x2go import X2goClientXConfig as _X2goClientXConfig
from x2go import X2goLogger as _X2goLogger
from x2go import x2go_cleanup as _x2go_cleanup
-# X2go backends
+# X2Go backends
from x2go.defaults import BACKENDS_CONTROLSESSION, BACKEND_CONTROLSESSION_DEFAULT
from x2go.defaults import BACKENDS_TERMINALSESSION, BACKEND_TERMINALSESSION_DEFAULT
from x2go.defaults import BACKENDS_SERVERSESSIONINFO, BACKEND_SERVERSESSIONINFO_DEFAULT
@@ -96,7 +96,7 @@ __version__ = _version
# version information
VERSION=_version
VERSION_TEXT="""
-%s[%s] - an X2go GUI client written in Python
+%s[%s] - an X2Go GUI client written in Python
----------------------------------------------------------------------
developed by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
sponsored by Dick Kniep <dick.kniep(a)lindix.nl> (2010-2011)
@@ -163,7 +163,7 @@ for _printing_backend_default in _config_backends:
debug_options = [
{'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', },
{'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', },
- {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2go module', },
+ {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2Go module', },
{'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', },
{'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
]
@@ -223,13 +223,13 @@ def parseargs():
global DEBUG
global print_action_args
- p = argparse.ArgumentParser(description='Graphical X2go client implemented in (wx)Python.',\
+ p = argparse.ArgumentParser(description='Graphical X2Go client implemented in (wx)Python.',\
formatter_class=argparse.RawDescriptionHelpFormatter, \
add_help=True, argument_default=None)
p_debugopts = p.add_argument_group('Debug options')
p_guiopts = p.add_argument_group('PyHoca-GUI options')
p_portableopts = p.add_argument_group('Portable application support')
- p_backendopts = p.add_argument_group('Python X2go backend options (for experts only)')
+ p_backendopts = p.add_argument_group('Python X2Go backend options (for experts only)')
if _X2GOCLIENT_OS == 'Windows':
p_contribopts = p.add_argument_group('XServer options (MS Windows only)')
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 4e99184..c545170 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -362,7 +362,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if _can_session_auto_connect:
self._X2goClient__connect_session(session_uuid)
if not self._X2goClient__server_valid_x2gouser(session_uuid):
- self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2go sessions!'), icon='session_warning', timeout=10000)
+ self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2Go sessions!'), icon='session_warning', timeout=10000)
self.OnServerDisconnect(evt)
try:
self._temp_disabled_profile_names.remove(profile_name)
@@ -566,7 +566,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
session_names = self._X2goClient__server_running_sessions(session_uuid) + self._X2goClient__server_suspended_sessions(session_uuid)
if self._X2goClient__server_is_alive(session_uuid):
if session_names:
- _notify_text = _(u'Cleaning X2go sessions...')
+ _notify_text = _(u'Cleaning X2Go sessions...')
self._hide_notifications_map[self.current_profile_name] = []
for session_name in session_names:
_notify_text += '\n%s' % session_name
@@ -585,7 +585,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
# disconnect all profile sessions
if self._X2goClient__server_is_alive(session_uuid):
self._X2goClient__disconnect_profile(self.current_profile_name)
- self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000)
+ self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2Go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000)
if self.exit_on_disconnect:
self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, self.current_profile_name), loglevel=x2go.loglevel_NOTICE)
self.WakeUpIdle()
@@ -600,7 +600,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
STILL UNDOCUMENTED
"""
- self._pyhoca_logger('adding new X2go session profile', loglevel=x2go.log.loglevel_INFO, )
+ self._pyhoca_logger('adding new X2Go session profile', loglevel=x2go.log.loglevel_INFO, )
profilemanager.PyHocaGUI_ProfileManager(self, 'ADD', profile_name=_(u'New Session Profile'))
def OnProfileEdit(self, evt):
@@ -740,7 +740,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.OnExit(evt)
##
- ## Python X2go (X2goClient) interactive HOOK's...
+ ## Python X2Go (X2goClient) interactive HOOK's...
##
def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA', ):
"""\
@@ -769,10 +769,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
return retval
##
- ## Python X2go (X2goClient) notification HOOK's...
+ ## Python X2Go (X2goClient) notification HOOK's...
##
- # this hook gets called from Python X2go classes if profile_name's control session has died...
+ # this hook gets called from Python X2Go classes if profile_name's control session has died...
def HOOK_on_control_session_death(self, profile_name):
self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000)
try:
@@ -791,9 +791,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN'):
if session_name == 'UNKNOWN':
- self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2go server.') % cmd, icon='session_error', timeout=10000)
+ self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2Go server.') % cmd, icon='session_error', timeout=10000)
else:
- self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2go server\n%s.') % (cmd, session_name), icon='session_error', timeout=10000)
+ self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2Go server\n%s.') % (cmd, session_name), icon='session_error', timeout=10000)
if self.exit_on_disconnect:
self.WakeUpIdle()
self.ExitMainLoop()
@@ -817,18 +817,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.ExitMainLoop()
def HOOK_pulseaudio_not_supported_in_RDPsession(self):
- self.notifier.send(_(u'%s - audio warning') % self.appname, _(u'The X2go PulseAudio system is not available within Remote Desktop sessions.'), icon='audio_error', timeout=10000)
+ self.notifier.send(_(u'%s - audio warning') % self.appname, _(u'The X2Go PulseAudio system is not available within Remote Desktop sessions.'), icon='audio_error', timeout=10000)
def HOOK_pulseaudio_server_startup_failed(self):
- self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2go PulseAudio system could not be started.'), icon='audio_error', timeout=10000)
+ self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2Go PulseAudio system could not be started.'), icon='audio_error', timeout=10000)
def HOOK_pulseaudio_server_died(self):
- self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2go PulseAudio system has died unexpectedly.'), icon='audio_error', timeout=10000)
+ self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2Go PulseAudio system has died unexpectedly.'), icon='audio_error', timeout=10000)
def HOOK_on_sound_tunnel_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
self.notifier.send(_(u'%s - audio problem') % profile_name, _(u'The audio connection could not be set up for this session.\n%s') % session_name, icon='session_warning', timeout=5000)
- # this hook gets called from Python X2go classes if a print job is coming in and the print action is ,,DIALOG''...
+ # this hook gets called from Python X2Go classes if a print job is coming in and the print action is ,,DIALOG''...
def HOOK_open_print_dialog(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
_print_action = None
_pp_dialog = printingprefs.PyHocaGUI_PrintingPreferences(self, mode='print', profile_name=profile_name, session_name=session_name)
@@ -846,19 +846,19 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def HOOK_on_session_has_started_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
self._enable_session_name(profile_name, session_name)
- self.notifier.send(_(u'%s - start') % profile_name, _(u'New X2go session starting up...\n%s') % session_name, icon='session_start', timeout=5000)
+ self.notifier.send(_(u'%s - start') % profile_name, _(u'New X2Go session starting up...\n%s') % session_name, icon='session_start', timeout=5000)
def HOOK_on_session_has_started_by_other(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
self._enable_session_name(profile_name, session_name)
- self.notifier.send(_(u'%s - start') % profile_name, _(u'Another client started X2go session\n%s') % session_name, icon='session_start', timeout=5000)
+ self.notifier.send(_(u'%s - start') % profile_name, _(u'Another client started X2Go session\n%s') % session_name, icon='session_start', timeout=5000)
def HOOK_on_session_has_resumed_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
self._enable_session_name(profile_name, session_name)
- self.notifier.send(_(u'%s - resume') % profile_name, _(u'Resuming X2go session...\n%s') % session_name, icon='session_resume', timeout=5000)
+ self.notifier.send(_(u'%s - resume') % profile_name, _(u'Resuming X2Go session...\n%s') % session_name, icon='session_resume', timeout=5000)
def HOOK_on_session_has_resumed_by_other(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
self._enable_session_name(profile_name, session_name)
- self.notifier.send(_(u'%s - resume') % profile_name, _(u'Another client resumed X2go session\n%s') % session_name, icon='session_resume', timeout=5000)
+ self.notifier.send(_(u'%s - resume') % profile_name, _(u'Another client resumed X2Go session\n%s') % session_name, icon='session_resume', timeout=5000)
def HOOK_on_found_session_running_after_connect(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
self._enable_session_name(profile_name, session_name)
@@ -866,7 +866,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def HOOK_on_session_has_been_suspended(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
self._enable_session_name(profile_name, session_name)
- self.notifier.send(_(u'%s - suspend') % profile_name, _(u'X2go Session has been suspended\n%s') % session_name, icon='session_suspend', timeout=5000)
+ self.notifier.send(_(u'%s - suspend') % profile_name, _(u'X2Go Session has been suspended\n%s') % session_name, icon='session_suspend', timeout=5000)
if self.disconnect_on_suspend:
_dummy_id = wx.NewId()
self._eventid_profilenames_map[_dummy_id] = profile_name
@@ -882,7 +882,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if not self._hide_notifications_map[profile_name]:
del self._hide_notifications_map[profile_name]
else:
- self.notifier.send(_(u'%s - terminate') % profile_name, _(u'X2go Session has terminated\n%s') % session_name, icon='session_terminate', timeout=5000)
+ self.notifier.send(_(u'%s - terminate') % profile_name, _(u'X2Go Session has terminated\n%s') % session_name, icon='session_terminate', timeout=5000)
if self.disconnect_on_terminate:
_dummy_id = wx.NewId()
self._eventid_profilenames_map[_dummy_id] = profile_name
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 74af118..6b66930 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -275,7 +275,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
if not self._PyHocaGUI._X2goClient__server_valid_x2gouser(session_uuid):
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - connect failure') % self.current_profile_name,
- text=_(u'User is not allowed to start X2go sessions!'),
+ text=_(u'User is not allowed to start X2Go sessions!'),
icon='auth_error')
self._PyHocaGUI.OnServerDisconnect(evt)
else:
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index 9ae8031..5086963 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -29,7 +29,7 @@ import gevent
# PyHoca-GUI modules
import basepath
-# X2go modules
+# X2Go modules
from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
_icons_location = basepath.icons_basepath
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 77528fd..c876065 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -245,7 +245,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.EnableSound = wx.CheckBox(self.tab_Settings, -1, _(u"Enable sound support"))
self.PulseAudio = wx.RadioButton(self.tab_Settings, -1, _(u"Pulse Audio"), style=wx.RB_GROUP)
- # Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated.
+ # Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
# However, config files can contain an Arts configuration, so we will honour this
self.Arts = wx.RadioButton(self.tab_Settings, -1, _(u"Arts (not supported)"))
self.Arts.Enable(False)
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index d4b3c50..837399b 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -79,15 +79,15 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name)
else:
self.icon = self.MakeIcon(icon_name='pyhoca-trayicon')
- self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2go server ,,%s\'\'") % profile_name)
+ self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name)
def SetIconIdle(self):
if x2go.X2GOCLIENT_OS == 'Windows':
self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
- self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2go..."))
+ self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go..."))
else:
self.icon = self.MakeIcon(icon_name='pyhoca-trayicon')
- self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2go server"))
+ self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server"))
def CreateSessionManagerPopupMenu(self, evt):
"""\
diff --git a/setup.py b/setup.py
index 5a5dba6..3b5b66e 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ if platform.system() == 'Linux':
setup(
name = "pyhoca-gui",
version = pyhoca.wxgui.__VERSION__,
- description = "PyHoca-GUI is a cross-platform (Windows, MacOS X, Linux) graphical X2go client.",
+ description = "PyHoca-GUI is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.",
license = 'GPL',
author = 'Mike Gabriel, Dick Kniep',
url = 'http://www.x2go.org',
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
1
0
31 Jan '12
The branch, master has been updated
via 504ab9ae092405ab51e8fe975961114356997bf4 (commit)
from da34d5dcb4c4b2eb87f8b796397c06d0b15f5950 (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 504ab9ae092405ab51e8fe975961114356997bf4
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Jan 31 23:31:54 2012 +0100
more X2go -> X2Go replacements
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
test.py | 2 +-
x2go/__init__.py | 8 ++++----
x2go/backends/control/_stdout.py | 2 +-
x2go/backends/terminal/_stdout.py | 2 +-
x2go/cache.py | 2 +-
x2go/defaults.py | 2 +-
x2go/session.py | 2 +-
x2go/tests/runalltests.py | 2 +-
x2go/xserver.py | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a6cb328..36703a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -406,7 +406,7 @@ python-x2go (0.0.30-0~nwt1) lucid maverick testing unstable; urgency=low
* adds encodings support to local folder sharing
* bugfix: now unknown session profile options are really ignored
- * introduces new Python-X2go-only session profile option ,,useexports''
+ * introduces new Python-X2Go-only session profile option ,,useexports''
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 22:30:00 +0100
diff --git a/test.py b/test.py
index 9853bbf..82a30ba 100755
--- a/test.py
+++ b/test.py
@@ -19,7 +19,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""
-Unit tests for Python X2go.
+Unit tests for Python X2Go.
"""
import os
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 7994d0d..d6f1fc3 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -32,9 +32,9 @@ API Concept
Python X2Go consists of quite a few classes. Furthermore,
Python X2Go is quite heavily taking advantage of Python\'s
threading features. When providing a library like Python
- X2go, it is always quite a task to keep the library code
+ X2Go, it is always quite a task to keep the library code
compatible with former versions of the same library. This is
- intended for Python X2go, but with some restraints.
+ intended for Python X2Go, but with some restraints.
Python X2Go only offers 5 public API classes. With the release of
version 0.1.0.0, we will try to keep these 5 public API classes
@@ -55,7 +55,7 @@ API Concept
Any other of the Python X2Go classes may be subject to internal changes
and the way of addressing these classes in code may vary between different
- versions of Python X2go. If you directly use other than the 5 public API
+ versions of Python X2Go. If you directly use other than the 5 public API
classes in your own applications, so please be warned.
@@ -152,7 +152,7 @@ Dependencies
Contact
=======
- If you have any questions concerning Python X2go, please sign up for the
+ If you have any questions concerning Python X2Go, please sign up for the
x2go-dev list (https://lists.berlios.de/mailman/listinfo/x2go-dev) and post
your questions, requests and feedbacks there.
"""
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 913ff1b..f3b3718 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -318,7 +318,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
Connect to an X2Go server and authenticate to it. This method is directly
inherited from the paramiko.SSHClient module. The features of the Paramiko
SSH client connect method are recited here. The parameters C{add_to_known_hosts}
- and C{force_password_auth} have been added as a parameter for X2go.
+ and C{force_password_auth} have been added as a parameter for X2Go.
The server's host key
is checked against the system host keys (see C{load_system_host_keys})
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 1ea6f9a..b3c6ba9 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -422,7 +422,7 @@ class X2goTerminalSessionSTDOUT(object):
###
### ARTSD AUDIO
###
- self.logger('the ArtsD sound server (as in KDE3) is obsolete and will not be supported by Python X2go...', loglevel=log.loglevel_WARNING)
+ self.logger('the ArtsD sound server (as in KDE3) is obsolete and will not be supported by Python X2Go...', loglevel=log.loglevel_WARNING)
elif self.params.snd_system == 'esd':
###
diff --git a/x2go/cache.py b/x2go/cache.py
index 4b99696..3c11def 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -33,7 +33,7 @@ import x2go_exceptions
class X2goListSessionsCache(object):
"""\
- For non-blocking operations in client applications using Python X2go, it is
+ For non-blocking operations in client applications using Python X2Go, it is
recommended to enable the L{X2goListSessionsCache}. This can be done by calling
the constructor of the L{X2goClient} class.
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 8bd0e96..8be690f 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-Default variables and values for Python X2go.
+Default variables and values for Python X2Go.
"""
__NAME__ = 'x2godefaults-pylib'
diff --git a/x2go/session.py b/x2go/session.py
index 802d1cf..0c8eb2e 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goSession class - a public API of Python X2go, handling standalone X2Go
+X2goSession class - a public API of Python X2Go, handling standalone X2Go
sessions.
This class is normally embedded into the context of an L{X2goClient}
diff --git a/x2go/tests/runalltests.py b/x2go/tests/runalltests.py
index c4373a8..a4320b8 100644
--- a/x2go/tests/runalltests.py
+++ b/x2go/tests/runalltests.py
@@ -20,7 +20,7 @@
"""\
This file is a default test runner as found in ZOPE/Plone products. It works
-fine for any kind of Python unit testing---as we do here for Python X2go.
+fine for any kind of Python unit testing---as we do here for Python X2Go.
"""
import os
diff --git a/x2go/xserver.py b/x2go/xserver.py
index e3fe85b..e59e2bd 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -104,7 +104,7 @@ class X2goClientXConfig(inifiles.X2goIniFile):
@property
def known_xservers(self):
"""\
- Renders a list of XServers that are known to Python X2go.
+ Renders a list of XServers that are known to Python X2Go.
"""
return self.get_value('XServers', 'known_xservers')
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
31 Jan '12
The branch, master has been updated
via da34d5dcb4c4b2eb87f8b796397c06d0b15f5950 (commit)
from 10bb244d21b74faf4908f7b13ff25f54d73a78d3 (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 da34d5dcb4c4b2eb87f8b796397c06d0b15f5950
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Jan 31 23:29:16 2012 +0100
Replace any non-code string ,,X2go'' by ,,X2Go''.
-----------------------------------------------------------------------
Summary of changes:
README | 44 ++--
README.Trinity-Desktop | 6 +-
TODO | 2 +-
debian/changelog | 19 +-
examples/x2go_resume_session.py | 4 +-
examples/x2go_start_session.py | 4 +-
setup.py | 6 +-
test.py | 4 +-
x2go/__init__.py | 60 +++---
x2go/backends/__init__.py | 4 +-
x2go/backends/control/__init__.py | 4 +-
x2go/backends/control/_stdout.py | 84 +++---
x2go/backends/info/__init__.py | 4 +-
x2go/backends/info/_stdout.py | 24 +-
x2go/backends/printing/__init__.py | 4 +-
x2go/backends/printing/_file.py | 18 +-
x2go/backends/printing/_gconf.py | 12 +-
x2go/backends/printing/_winreg.py | 12 +-
x2go/backends/profiles/__init__.py | 4 +-
x2go/backends/profiles/_file.py | 10 +-
x2go/backends/profiles/_gconf.py | 8 +-
x2go/backends/profiles/_httpsbroker.py | 8 +-
x2go/backends/profiles/_winreg.py | 8 +-
x2go/backends/proxy/__init__.py | 4 +-
x2go/backends/proxy/_nx3.py | 8 +-
x2go/backends/proxy/base.py | 16 +-
x2go/backends/settings/__init__.py | 4 +-
x2go/backends/settings/_file.py | 10 +-
x2go/backends/settings/_gconf.py | 10 +-
x2go/backends/settings/_winreg.py | 10 +-
x2go/backends/terminal/__init__.py | 4 +-
x2go/backends/terminal/_stdout.py | 114 ++++----
x2go/cache.py | 12 +-
x2go/checkhosts.py | 14 +-
x2go/cleanup.py | 16 +-
x2go/client.py | 436 ++++++++++++++++----------------
x2go/defaults.py | 26 +-
x2go/forward.py | 14 +-
x2go/gevent_subprocess.py | 6 +-
x2go/guardian.py | 18 +-
x2go/inifiles.py | 12 +-
x2go/log.py | 8 +-
x2go/mimebox.py | 24 +-
x2go/mimeboxactions.py | 24 +-
x2go/monkey_patch_paramiko.py | 4 +-
x2go/printactions.py | 46 ++--
x2go/printqueue.py | 30 +-
x2go/pulseaudio.py | 6 +-
x2go/registry.py | 76 +++---
x2go/rforward.py | 30 +-
x2go/session.py | 140 +++++-----
x2go/sftpserver.py | 28 +-
x2go/sshproxy.py | 10 +-
x2go/tests/__init__.py | 6 +-
x2go/tests/runalltests.py | 6 +-
x2go/tests/test_printing.py | 6 +-
x2go/utils.py | 12 +-
x2go/x2go_exceptions.py | 8 +-
x2go/xserver.py | 12 +-
59 files changed, 782 insertions(+), 781 deletions(-)
The diff of changes is:
diff --git a/README b/README
index c42bccf..f8e410c 100644
--- a/README
+++ b/README
@@ -6,19 +6,19 @@ See http://www.gnu.org/licenses/agpl.html for a recent copy.
=== What is Python X2go? ===
-The Python X2go module integrates X2go client support into your python programmes.
-Python X2go is used in the headless X2go client »pyhoca-cli« and by the tiny systray GUI
+The Python X2Go module integrates X2Go client support into your python programmes.
+Python X2Go is used in the headless X2Go client »pyhoca-cli« and by the tiny systray GUI
application »pyhoca-gui«
-Python X2go takes advantages of the NX Proxy by NoMachine published under GPL.
+Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL.
On Windows and MacOS X systems you have to make sure that you have installed a current
NX Proxy executable somewhere on your system. It probably will be sufficient to have
-the X2go project's x2goclient package installed on your client machine.
+the X2Go project's x2goclient package installed on your client machine.
On Debian / Ubuntu systems there is a nxproxy package available within the distribution.
-Python X2go defaults to using the distro nxproxy binary.
+Python X2Go defaults to using the distro nxproxy binary.
-Python X2go was originally inspired by work of Jörg Sawatzki <joerg.sawatzki(a)web.de>.
+Python X2Go was originally inspired by work of Jörg Sawatzki <joerg.sawatzki(a)web.de>.
Unfortunately, Jörg had to give up work on his ideas due to licensing issues with his
contractor. To make his ideas furthermore available to the OSS community this complete
rewrite of Jörgs ideas has been called into life.
@@ -31,9 +31,9 @@ and wholeheartedness concerning this inner process.
=== Requirements ===
-* X2go Server
- - you need a working X2go server to connect to. In order to use shadowing make sure
- you have at least X2go Baikal (3.1.x) installed
+* X2Go Server
+ - you need a working X2Go server to connect to. In order to use shadowing make sure
+ you have at least X2Go Baikal (3.1.x) installed
* on the client system you will need
- the python-gevent library (for details refer to: http://www.gevent.org/)
- the python-paramiko library (SSH implementation in Python, http://www.lag.net/paramiko/)
@@ -44,24 +44,24 @@ and wholeheartedness concerning this inner process.
- also working: if no Ghostscript/GSView is installed the win32api ,,print'' command will
be executed on incoming PDF print spool files. Win32api will try launch the print function
of the default PDF viewer application (mostly Adobe Acrobat Reader)
- - if you have a choice: install Ghostscript/GSview on the system that uses Python X2go
+ - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go
applications... it's highly recommended
=== Current features ===
-* start X2go agent session
-* suspend X2go session
-* resume X2go session
-* terminate X2go session
-* clean user's X2go sessions
-* list user's X2go sessions
+* start X2Go agent session
+* suspend X2Go session
+* resume X2Go session
+* terminate X2Go session
+* clean user's X2Go sessions
+* list user's X2Go sessions
* use Pulse Audio sound
-* X2go printing
+* X2Go printing
* reading/writing session profiles from file
* sharing of local (client-side) folders (SFTP server is integrated in Python X2go)
* connect via proxy SSH server
-* X2go MIME box support
+* X2Go MIME box support
* desktop sharing (shadow sessions)
* color depth auto-recognition
@@ -105,11 +105,11 @@ Testing and writing a short howto for this section is very welcome.
=== How to use it from the command line? ===
-A good example for the usage of Python X2go is the pyhoca-cli programme, a headless
-X2go client that aims at 100% compatibility with X2goClient applications released in
-the X2go project.
+A good example for the usage of Python X2Go is the pyhoca-cli programme, a headless
+X2Go client that aims at 100% compatibility with X2goClient applications released in
+the X2Go project.
-On Debian/Ubuntu you can easily install the X2go Client by running APT again:
+On Debian/Ubuntu you can easily install the X2Go Client by running APT again:
$ apt-get install pyhoca-cli
diff --git a/README.Trinity-Desktop b/README.Trinity-Desktop
index df6ee02..90ffa21 100644
--- a/README.Trinity-Desktop
+++ b/README.Trinity-Desktop
@@ -1,10 +1,10 @@
Trinity Deskop (KDE3.5 fork) and (Python) X2go
==============================================
-Python X2go brings support to start Trinity Desktops on remote
-X2go servers.
+Python X2Go brings support to start Trinity Desktops on remote
+X2Go servers.
-For this to work let a symbolic link on the X2go server
+For this to work let a symbolic link on the X2Go server
point from /usr/local/bin/starttrinity to Trinity's startkde script:
root@x2goserver:~ ln -s /opt/trinity/bin/startkde /usr/local/bin/starttrinity
diff --git a/TODO b/TODO
index da6dc7b..24d9389 100644
--- a/TODO
+++ b/TODO
@@ -13,7 +13,7 @@ as of 20110701
* add Windows Registry backend (session profiles, client configs)
* add gconf backend (session profiles, client configs)
-=== Python X2go wishlist ===
+=== Python X2Go wishlist ===
* SOCKS client support
diff --git a/debian/changelog b/debian/changelog
index 4efe979..a6cb328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
with python-x2go.
- Add default value for new session profile parameter xinerama (ignored by
Python X2Go for now).
+ - Replace any non-code string ,,X2go'' by ,,X2Go''.
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
@@ -62,7 +63,7 @@ python-x2go (0.1.1.7-0-x2go1) unstable; urgency=low
- Use TCP_NODELAY socket option for graphics forwarding tunnels.
- Typo fixes in session.py, related to calling _X2goSession__disconnect
method.
- - Compatibility fix for X2go folder sharing (session profile attribute:
+ - Compatibility fix for X2Go folder sharing (session profile attribute:
export).
- Provide test method to query server if folder sharing is available.
- Test for existence of remote home directory on connect.
@@ -117,7 +118,7 @@ python-x2go (0.1.1.3-0~x2go1) unstable; urgency=low
- Desktop sharing: try ''<user>@<display>.0'' additionally to ''<user>@<display>'' when
trying to find a desktop for sharing.
- Fix AttributeError if no graphical proxy instance has been declared yet.
- - Do not allow any interruption during X2go cleanup calls.
+ - Do not allow any interruption during X2Go cleanup calls.
- Stabilize desktop sharing if the remote session is not available.
- Enforce IPv4 on all SSH proxy and other SSHClient connections when connecting to
''localhost''.
@@ -151,7 +152,7 @@ python-x2go (0.1.1.1-0~x2go1) unstable; urgency=low
python-x2go (0.1.1.0-0~x2go1) unstable; urgency=low
* New upstream version (0.1.1.0):
- - Add X2go desktop sharing support.
+ - Add X2Go desktop sharing support.
- Fix SSH authentication failures (close session on failure).
- Close SSH connection first, then close down SSH proxy.
- Make sure SSH proxy password gets forgotten between two sessions.
@@ -174,11 +175,11 @@ python-x2go (0.1.1.0-0~x2go1) unstable; urgency=low
- Add X2goSession lock support.
- Skip session auto registration during startups of new sessions (avoids
duplicate sessions in the session registry.
- - Do not start X2go service tunnels (audio, sshfs) if session startup failed.
+ - Do not start X2Go service tunnels (audio, sshfs) if session startup failed.
- Fix NX proxy startup post-check.
- Force 16bit colour depth for RDP-proxy sessions.
- Faulty sessions (without a NX proxy fw tunnel) will get terminated whenever
- the X2go server (SSHd) denies the tunnel setup.
+ the X2Go server (SSHd) denies the tunnel setup.
- Detect local color depth and use it as default for new sessions.
- Add compatibility check methods for color depth.
- Provide X2goClient method for retrieval of session by session name.
@@ -264,7 +265,7 @@ python-x2go (0.0.42.0-0~x2go2) unstable; urgency=low
python-x2go (0.0.42.0-0~x2go1) unstable; urgency=low
* switches to source format 3.0 (native)
- * building on behalf of X2go project (changes version/revision string of
+ * building on behalf of X2Go project (changes version/revision string of
package)
* building only for unstable
@@ -349,7 +350,7 @@ python-x2go (0.0.36-0~nwt2) lucid maverick stable testing unstable; urgency=low
python-x2go (0.0.36-0~nwt1) lucid maverick testing unstable; urgency=low
* fixed non-starting sshfs issue
- * made XServer VcXsrv known to Python X2go (relevant for Windows)
+ * made XServer VcXsrv known to Python X2Go (relevant for Windows)
* catching forward tunnel setup failure by session and client hook method
* improved handling of network failures (i.e. when triggering disconnect
events)
@@ -504,7 +505,7 @@ python-x2go (0.0.20-0~nwt1) lucid maverick testing unstable; urgency=low
python-x2go (0.0.14-0~nwt1) lucid maverick testing unstable; urgency=low
- * added X2go printing support
+ * added X2Go printing support
-- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 28 Oct 2010 23:00:00 +0200
@@ -582,7 +583,7 @@ python-x2go (0.0.5-0~nwt1) unstable; urgency=low
* added Paramiko/SSH reverse forwarding tunnel support
* Pulse Audio support has been added
- * SSH connections back to the X2go client are possible
+ * SSH connections back to the X2Go client are possible
* distro codename lucid -> unstable
* linitian version 3.9.0
diff --git a/examples/x2go_resume_session.py b/examples/x2go_resume_session.py
index b2bb325..d755860 100644
--- a/examples/x2go_resume_session.py
+++ b/examples/x2go_resume_session.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/examples/x2go_start_session.py b/examples/x2go_start_session.py
index bae696b..48244e4 100644
--- a/examples/x2go_start_session.py
+++ b/examples/x2go_start_session.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/setup.py b/setup.py
index 2432978..aa1076e 100755
--- a/setup.py
+++ b/setup.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -24,7 +24,7 @@ import x2go
setup(
name = "x2go",
version = x2go.__VERSION__,
- description = "Python X2go implements an X2go client/session library in python based on the paramiko SSH library.",
+ description = "Python X2Go implements an X2Go client/session library in python based on the paramiko SSH library.",
license = 'GPL',
author = 'Mike Gabriel',
url = 'http://www.x2go.org',
diff --git a/test.py b/test.py
index 9d9d715..9853bbf 100755
--- a/test.py
+++ b/test.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/__init__.py b/x2go/__init__.py
index e10ff75..7994d0d 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,42 +18,42 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-Python X2go is a python module that implements X2go client support for
-the free X2go server project (U{http://wiki.x2go.org}) in Python.
+Python X2Go is a python module that implements X2Go client support for
+the free X2Go server project (U{http://wiki.x2go.org}) in Python.
Introduction
============
- With Python X2go you can write your own X2go clients or embed X2go client
+ With Python X2Go you can write your own X2Go clients or embed X2Go client
features into already existing application environments.
API Concept
===========
- Python X2go consists of quite a few classes. Furthermore,
- Python X2go is quite heavily taking advantage of Python\'s
+ Python X2Go consists of quite a few classes. Furthermore,
+ Python X2Go is quite heavily taking advantage of Python\'s
threading features. When providing a library like Python
X2go, it is always quite a task to keep the library code
compatible with former versions of the same library. This is
intended for Python X2go, but with some restraints.
- Python X2go only offers 5 public API classes. With the release of
+ Python X2Go only offers 5 public API classes. With the release of
version 0.1.0.0, we will try to keep these 5 public API classes
of future releases as compatible as possible with versions of Python X2go
greater/equal than v0.1.0.0.
The 4 public API classes are:
- - L{X2goClient} --- a whole X2go client API
- - L{X2goSession} --- management of an individual X2go
+ - L{X2goClient} --- a whole X2Go client API
+ - L{X2goSession} --- management of an individual X2Go
session started from an L{X2goClient} instance
- - L{X2goClientSettings} --- provide access to X2go (global and
+ - L{X2goClientSettings} --- provide access to X2Go (global and
user) configuration node »settings«
- - L{X2goClientPrinting} --- provide access to X2go (global and
+ - L{X2goClientPrinting} --- provide access to X2Go (global and
user) configuration node »printing«
- - L{X2goSessionProfiles} --- provide access to X2go (global and
+ - L{X2goSessionProfiles} --- provide access to X2Go (global and
user) configuration node »sessions«
- Any other of the Python X2go classes may be subject to internal changes
+ Any other of the Python X2Go classes may be subject to internal changes
and the way of addressing these classes in code may vary between different
versions of Python X2go. If you directly use other than the 5 public API
classes in your own applications, so please be warned.
@@ -62,7 +62,7 @@ API Concept
API Structure
=============
- When using Python X2go in your applications, the basic idea is that you
+ When using Python X2Go in your applications, the basic idea is that you
create your own class and inherit the X2goClient class in that::
import x2go
@@ -70,10 +70,10 @@ API Structure
...
- The L{X2goClient} class flattens the complex structure of Python X2go into
+ The L{X2goClient} class flattens the complex structure of Python X2Go into
many L{X2goClient} methods that you can use in your own C{MyX2goClient} instances.
- However, it might be handy to retrieve a whole X2go session instance
+ However, it might be handy to retrieve a whole X2Go session instance
from the L{X2goClient} instance. This can be achieved by the
L{X2goClient.register_session()} method::
@@ -91,7 +91,7 @@ API Structure
The L{X2goClient.register_session()} method---in object-retrieval-mode---returns
an L{X2goSession} instance. With this instance you can then manage
- your X2go session::
+ your X2Go session::
import gevent, getpass
pw=getpass.getpass()
@@ -105,7 +105,7 @@ API Structure
# or alternatively:
reg_session_instance.terminate()
- How to access---especially how to modify---the X2go client configuration
+ How to access---especially how to modify---the X2Go client configuration
files »settings«, »printing«, »sessions« and »xconfig« (Windows only)
is explained in detail with each class declaration in this API documentation.
Please refer to the class docs of L{X2goClientSettings}, L{X2goClientPrinting},
@@ -114,40 +114,40 @@ API Structure
Configuration and Session Management
====================================
- Python X2go strictly separates configuration management from
+ Python X2Go strictly separates configuration management from
session management. The classes needed for session management
/ administration are supposed to only gain »read access« to the
- classes handling the X2go client configuration nodes.
+ classes handling the X2Go client configuration nodes.
- A configuration node in Python X2go can be a file, a gconf database
+ A configuration node in Python X2Go can be a file, a gconf database
section, a section in the Windows registry, etc.
NOTE: Each configuration node will be re-read whenever it is needed
- by an X2go sesion or the X2goClient class itself.
+ by an X2Go sesion or the X2goClient class itself.
Conclusively, any change to either of the configuration nodes
- will be reflected as a change in your X2go client behaviour:
+ will be reflected as a change in your X2Go client behaviour:
- L{X2goSessionProfiles}: changes to a session profile in
the »sessions« node will be available for the next registered
L{X2goSession} instance
- - L{X2goClientPrinting}: on each incoming X2go print job the
+ - L{X2goClientPrinting}: on each incoming X2Go print job the
»printing« configuration node will be re-read, thus you can
- change your X2go client's print setup during a running session
+ change your X2Go client's print setup during a running session
- L{X2goClientSettings}: also the configuration node »settings«
- is re-read whenever needed in the course of X2go session management
+ is re-read whenever needed in the course of X2Go session management
- L{X2goXServer} (Windows only): this class will only be initialized
once (starting the XServer on Windows platforms) on construction
of an L{X2goClient} instance
Dependencies
============
- Python X2go takes advantage of the libevent/greenlet implementation
+ Python X2Go takes advantage of the libevent/greenlet implementation
gevent (http://www.gevent.org) The least needed version of Python gevent
is 0.13.0 (or above).
- Python X2go (because of gevent) requires at least Python 2.6. Further recent
- information on Python X2go is available at:
+ Python X2Go (because of gevent) requires at least Python 2.6. Further recent
+ information on Python X2Go is available at:
U{http://wiki.x2go.org/python-x2go}
Contact
diff --git a/x2go/backends/__init__.py b/x2go/backends/__init__.py
index e734301..f6412e4 100644
--- a/x2go/backends/__init__.py
+++ b/x2go/backends/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/control/__init__.py b/x2go/backends/control/__init__.py
index 52f1441..258c051 100644
--- a/x2go/backends/control/__init__.py
+++ b/x2go/backends/control/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index ba6c1ea..913ff1b 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goControlSessionSTDOUT class - core functions for handling your individual X2go sessions.
+X2goControlSessionSTDOUT class - core functions for handling your individual X2Go sessions.
-This backend handles X2go server implementations that respond via server-side STDOUT.
+This backend handles X2Go server implementations that respond via server-side STDOUT.
"""
__NAME__ = 'x2gocontrolsession-pylib'
@@ -39,7 +39,7 @@ import random
from gevent import socket
-# Python X2go modules
+# Python X2Go modules
import x2go.sshproxy as sshproxy
import x2go.log as log
import x2go.utils as utils
@@ -56,7 +56,7 @@ from x2go.monkey_patch_paramiko import monkey_patch_paramiko
monkey_patch_paramiko()
def _rerewrite_blanks(cmd):
- # X2go run command replace X2GO_SPACE_CHAR string with blanks
+ # X2Go run command replace X2GO_SPACE_CHAR string with blanks
if cmd:
cmd = cmd.replace("X2GO_SPACE_CHAR", " ")
return cmd
@@ -64,11 +64,11 @@ def _rerewrite_blanks(cmd):
def _rewrite_password(cmd, user=None, password=None):
# if there is a ,,-u X2GO_USER'' parameter in RDP options then we will replace
- # it by our X2go session password
+ # it by our X2Go session password
if cmd and user:
cmd = cmd.replace('X2GO_USER', user)
# if there is a ,,-p X2GO_PASSWORD'' parameter in RDP options then we will replace
- # it by our X2go session password
+ # it by our X2Go session password
if cmd and password:
cmd = cmd.replace('X2GO_PASSWORD', password)
return cmd
@@ -102,9 +102,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
logger=None, loglevel=log.loglevel_DEFAULT,
*args, **kwargs):
"""\
- Initialize an X2go session. With the L{X2goControlSessionSTDOUT} class you can start
- new X2go sessions, resume suspended sessions or suspend resp. terminate
- currently running sessions on a connected X2go server.
+ Initialize an X2Go session. With the L{X2goControlSessionSTDOUT} class you can start
+ new X2Go sessions, resume suspended sessions or suspend resp. terminate
+ currently running sessions on a connected X2Go server.
"""
self.associated_terminals = {}
@@ -199,45 +199,45 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
timeout = gevent.Timeout(20)
timeout.start()
try:
- self.logger("executing command on X2go server ,,%s'': %s" % (self.profile_name, _rerewrite_blanks(cmd)), loglevel)
+ self.logger("executing command on X2Go server ,,%s'': %s" % (self.profile_name, _rerewrite_blanks(cmd)), loglevel)
_retval = self.exec_command(_rewrite_password(cmd, user=self.get_transport().get_username(), password=self._session_password), **kwargs)
except AttributeError:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
self.locked = False
- raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
+ raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
except EOFError:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
self.locked = False
- raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
+ raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
except x2go_exceptions.SSHException:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
self.locked = False
- raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
+ raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
except gevent.timeout.Timeout:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
self.locked = False
- raise x2go_exceptions.X2goControlSessionException('the X2go control session command timed out')
+ raise x2go_exceptions.X2goControlSessionException('the X2Go control session command timed out')
except socket.error:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
self.locked = False
- raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
+ raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
finally:
self.locked = False
timeout.cancel()
else:
self.locked = False
- raise x2go_exceptions.X2goControlSessionException('the X2go control session is not connected')
+ raise x2go_exceptions.X2goControlSessionException('the X2Go control session is not connected')
return _retval
@property
@@ -315,7 +315,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
session_instance=None,
add_to_known_hosts=False, force_password_auth=False):
"""\
- Connect to an X2go server and authenticate to it. This method is directly
+ Connect to an X2Go server and authenticate to it. This method is directly
inherited from the paramiko.SSHClient module. The features of the Paramiko
SSH client connect method are recited here. The parameters C{add_to_known_hosts}
and C{force_password_auth} have been added as a parameter for X2go.
@@ -577,7 +577,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def start(self, **kwargs):
"""\
- Start a new X2go session.
+ Start a new X2Go session.
The L{X2goControlSessionSTDOUT.start()} method accepts any parameter
that can be passed to any of the C{X2goTerminalSession} backend class
@@ -588,7 +588,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def resume(self, session_name=None, session_instance=None, **kwargs):
"""\
- Resume a running/suspended X2go session.
+ Resume a running/suspended X2Go session.
The L{X2goControlSessionSTDOUT.resume()} method accepts any parameter
that can be passed to any of the C{X2goTerminalSession} backend class constructors.
@@ -598,7 +598,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
"""
if not self.is_x2gouser(self.get_transport().get_username()):
- raise x2go_exceptions.X2goUserException('remote user %s is not allowed to run X2go commands' % self.get_transport().get_username())
+ raise x2go_exceptions.X2goUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username())
if session_name is not None:
session_info = self.list_sessions()[session_name]
@@ -682,11 +682,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
List all desktop-like sessions of current user (or of users that have
granted desktop sharing) on the connected server.
- @param raw: if C{True}, the raw output of the server-side X2go command
+ @param raw: if C{True}, the raw output of the server-side X2Go command
C{x2godesktopsharing} is returned.
@type raw: C{bool}
- @return: a list of X2go desktops available for sharing
+ @return: a list of X2Go desktops available for sharing
@rtype: C{list}
"""
@@ -697,7 +697,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
else:
# this _success loop will catch errors in case the x2golistsessions output is corrupt
- # this should not be needed and is a workaround for the current X2go server implementation
+ # this should not be needed and is a workaround for the current X2Go server implementation
timeout = gevent.Timeout(maxwait)
timeout.start()
@@ -719,7 +719,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
"""\
List all sessions of current user on the connected server.
- @param raw: if C{True}, the raw output of the server-side X2go command
+ @param raw: if C{True}, the raw output of the server-side X2Go command
C{x2golistsessions} is returned.
@type raw: C{bool}
@@ -736,7 +736,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
else:
# this _success loop will catch errors in case the x2golistsessions output is corrupt
- # this should not be needed and is a workaround for the current X2go server implementation
+ # this should not be needed and is a workaround for the current X2Go server implementation
_listsessions = {}
_success = False
_count = 0
@@ -773,8 +773,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def clean_sessions(self, destroy_terminals=True):
"""\
- Find X2go terminals that have previously been started by the
- connected user on the remote X2go server and terminate them.
+ Find X2Go terminals that have previously been started by the
+ connected user on the remote X2Go server and terminate them.
"""
session_list = self.list_sessions()
@@ -783,10 +783,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def is_connected(self):
"""\
- Returns C{True} if this X2go session is connected to the remote server (that
+ Returns C{True} if this X2Go session is connected to the remote server (that
is if it has a valid Paramiko Transport object).
- @return: X2go session connected?
+ @return: X2Go session connected?
@rtype: C{bool}
"""
@@ -794,13 +794,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def is_running(self, session_name):
"""\
- Returns C{True} if the given X2go session is in running state,
+ Returns C{True} if the given X2Go session is in running state,
C{False} else.
- @param session_name: X2go name of the session to be queried
+ @param session_name: X2Go name of the session to be queried
@type session_name: str
- @return: X2go session running?
+ @return: X2Go session running?
@rtype: C{bool}
"""
@@ -811,10 +811,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def is_suspended(self, session_name):
"""\
- Returns C{True} if the given X2go session is in suspended state,
+ Returns C{True} if the given X2Go session is in suspended state,
C{False} else.
- @return: X2go session suspended?
+ @return: X2Go session suspended?
@rtype: C{bool}
"""
@@ -825,13 +825,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def has_terminated(self, session_name):
"""\
- Returns C{True} if this X2go session is not in the session list on the
+ Returns C{True} if this X2Go session is not in the session list on the
connected server, C{False} else.
Of course, if this command is called before session startup, it will also
return C{True}.
- @return: X2go session has terminate?
+ @return: X2Go session has terminate?
@rtype: C{bool}
"""
@@ -848,13 +848,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def suspend(self, session_name):
"""\
- Suspend either this or another available X2go session on the connected
+ Suspend either this or another available X2Go session on the connected
server.
If L{session_name} is given, L{X2goControlSessionSTDOUT.suspend()} tries to suspend the
corresponding session.
- @param session_name: X2go name of the session to be suspended
+ @param session_name: X2Go name of the session to be suspended
@type session_name: str
@return: True if the session could be successfully suspended
@@ -888,13 +888,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
def terminate(self, session_name, destroy_terminals=True):
"""\
- Terminate either this or another available X2go session on the connected
+ Terminate either this or another available X2Go session on the connected
server.
If L{session_name} is given, L{X2goControlSessionSTDOUT.terminate()} tries to terminate the
corresponding session.
- @param session_name: X2go name of the session to be terminated
+ @param session_name: X2Go name of the session to be terminated
@type session_name: str
@return: True if the session could be successfully terminate
diff --git a/x2go/backends/info/__init__.py b/x2go/backends/info/__init__.py
index d45424a..9c2aafa 100644
--- a/x2go/backends/info/__init__.py
+++ b/x2go/backends/info/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py
index c492d2d..ae6046c 100644
--- a/x2go/backends/info/_stdout.py
+++ b/x2go/backends/info/_stdout.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -19,9 +19,9 @@
"""\
X2goServerSessionList and X2goServerSessionInfo classes - data handling for
-X2go server sessions.
+X2Go server sessions.
-This backend handles X2go server implementations that respond with session infos
+This backend handles X2Go server implementations that respond with session infos
via server-side STDOUT.
"""
@@ -35,7 +35,7 @@ import types
class X2goServerSessionInfoSTDOUT(object):
"""\
L{X2goServerSessionInfo} is used to store all information
- that is retrieved from the connected X2go server on
+ that is retrieved from the connected X2Go server on
C{X2goTerminalSessionBACKEND.start()} resp. C{X2goTerminalSessionBACKEND.resume()}.
"""
@@ -130,18 +130,18 @@ class X2goServerSessionInfoSTDOUT(object):
def initialize(self, x2go_output, username='', hostname='', local_container='', remote_container=''):
"""\
- Parse X2go server's C{x2gostartagent} stdout values.
+ Parse X2Go server's C{x2gostartagent} stdout values.
- @param x2go_output: X2go server's C{x2gostartagent} command output, each value
+ @param x2go_output: X2Go server's C{x2gostartagent} command output, each value
separated by a newline character.
@type x2go_output: str
@param username: session user name
@type username: str
- @param hostname: hostname of X2go server
+ @param hostname: hostname of X2Go server
@type hostname: str
- @param local_container: X2go client session directory for config files, cache and session logs
+ @param local_container: X2Go client session directory for config files, cache and session logs
@type local_container: str
- @param remote_container: X2go server session directory for config files, cache and session logs
+ @param remote_container: X2Go server session directory for config files, cache and session logs
@type remote_container: str
"""
@@ -177,13 +177,13 @@ class X2goServerSessionInfoSTDOUT(object):
class X2goServerSessionListSTDOUT(object):
"""\
L{X2goServerSessionListSTDOUT} is used to store all information
- that is retrieved from a connected X2go server on a
+ that is retrieved from a connected X2Go server on a
C{X2goControlSessionBACKEND.list_sessions()} call.
"""
def __init__(self, x2go_output, info_backend=X2goServerSessionInfoSTDOUT):
"""\
- @param x2go_output: X2go server's C{x2golistsessions} command output, each
+ @param x2go_output: X2Go server's C{x2golistsessions} command output, each
session separated by a newline character. Session values are separated
by Unix Pipe Symbols ('|')
@type x2go_output: str
diff --git a/x2go/backends/printing/__init__.py b/x2go/backends/printing/__init__.py
index efc4275..80c3083 100644
--- a/x2go/backends/printing/__init__.py
+++ b/x2go/backends/printing/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py
index b3747a6..2405279 100644
--- a/x2go/backends/printing/_file.py
+++ b/x2go/backends/printing/_file.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -21,8 +21,8 @@
L{X2goClientPrintingFILE} class is one of Python X2go's public API classes.
Retrieve an instance of this class from your L{X2goClient} instance.
-Use this class in your Python X2go based applications to access the »printing«
-configuration of your X2go client application.
+Use this class in your Python X2Go based applications to access the »printing«
+configuration of your X2Go client application.
"""
__NAME__ = 'x2goprinting-pylib'
@@ -31,7 +31,7 @@ __NAME__ = 'x2goprinting-pylib'
import types
import ConfigParser
-# Python X2go modules
+# Python X2Go modules
import x2go.log as log
import x2go.printactions as printactions
# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
@@ -61,7 +61,7 @@ _print_property_map = {
class X2goClientPrintingFILE(inifiles.X2goIniFile):
"""\
- L{X2goClientPrinting} provides access to the X2go ini-like file
+ L{X2goClientPrinting} provides access to the X2Go ini-like file
»printing« as stored in C{~/.x2goclient/printing} resp. globally
C{/etc/x2goclient/printing}.
@@ -100,7 +100,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
def _detect_print_action(self):
"""\
Derive a print action from sections, keys and their values in a typical
- X2go client »printing« configuration file.
+ X2Go client »printing« configuration file.
"""
_general_pdfview = self.get('General', 'pdfview', key_type=types.BooleanType)
@@ -164,7 +164,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
_ini_option = _print_property_map[print_property]['ini_option']
return self.get_value(_ini_section, _ini_option)
else:
- raise x2go_exceptions.X2goClientPrintingException('No such X2go client printing property ,,%s\'\'' % print_property)
+ raise x2go_exceptions.X2goClientPrintingException('No such X2Go client printing property ,,%s\'\'' % print_property)
def set_property(self, print_property, value):
"""\
@@ -181,7 +181,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
raise x2go_exceptions.X2goClientPrintingException('Type mismatch error for property ,,%s\'\' - is: %s, should be: %s' % (print_property, str(type(value)), str(_default_type)))
self.update_value(_ini_section, _ini_option, value)
else:
- raise x2go_exceptions.X2goClientPrintingException('No such X2go client printing property ,,%s\'\'' % print_property)
+ raise x2go_exceptions.X2goClientPrintingException('No such X2Go client printing property ,,%s\'\'' % print_property)
def store_print_action(self, print_action, **print_properties):
"""\
diff --git a/x2go/backends/printing/_gconf.py b/x2go/backends/printing/_gconf.py
index aa97de4..0dcb0f2 100644
--- a/x2go/backends/printing/_gconf.py
+++ b/x2go/backends/printing/_gconf.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -21,8 +21,8 @@
L{X2goClientPrintingGCONF} class is one of Python X2go's public API classes.
Retrieve an instance of this class from your L{X2goClient} instance.
-Use this class in your Python X2go based applications to access the »printing«
-configuration of your X2go client application.
+Use this class in your Python X2Go based applications to access the »printing«
+configuration of your X2Go client application.
"""
__NAME__ = 'x2goprint-pylib'
@@ -31,7 +31,7 @@ __NAME__ = 'x2goprint-pylib'
import types
import ConfigParser
-# Python X2go modules
+# Python X2Go modules
import x2go.log as log
import x2go.printactions as printactions
# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
@@ -43,7 +43,7 @@ from x2go.x2go_exceptions import X2goNotImplementedYetException
class X2goClientPrintingGCONF(inifiles.X2goIniFile):
"""\
- L{X2goClientPrinting} provides access to the X2go ini-like file
+ L{X2goClientPrinting} provides access to the X2Go ini-like file
»printing« as stored in C{~/.x2goclient/printing} resp. globally
C{/etc/x2goclient/printing}.
diff --git a/x2go/backends/printing/_winreg.py b/x2go/backends/printing/_winreg.py
index ba02a29..ed9eb84 100644
--- a/x2go/backends/printing/_winreg.py
+++ b/x2go/backends/printing/_winreg.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -21,8 +21,8 @@
L{X2goClientPrintingWINREG} class is one of Python X2go's public API classes.
Retrieve an instance of this class from your L{X2goClient} instance.
-Use this class in your Python X2go based applications to access the »printing«
-configuration of your X2go client application.
+Use this class in your Python X2Go based applications to access the »printing«
+configuration of your X2Go client application.
"""
__NAME__ = 'x2goprint-pylib'
@@ -31,7 +31,7 @@ __NAME__ = 'x2goprint-pylib'
import types
import ConfigParser
-# Python X2go modules
+# Python X2Go modules
import x2go.log as log
import x2go.printactions as printactions
# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
@@ -43,7 +43,7 @@ from x2go.x2go_exceptions import X2goNotImplementedYetException
class X2goClientPrintingWINREG(inifiles.X2goIniFile):
"""\
- L{X2goClientPrinting} provides access to the X2go ini-like file
+ L{X2goClientPrinting} provides access to the X2Go ini-like file
»printing« as stored in C{~/.x2goclient/printing} resp. globally
C{/etc/x2goclient/printing}.
diff --git a/x2go/backends/profiles/__init__.py b/x2go/backends/profiles/__init__.py
index 1dded17..be84fcd 100644
--- a/x2go/backends/profiles/__init__.py
+++ b/x2go/backends/profiles/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index 0a49a3c..3a40544 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -20,7 +20,7 @@
"""\
L{X2goSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2go based
+L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -29,7 +29,7 @@ __NAME__ = 'x2gosessionprofiles-pylib'
import copy
import types
-# Python X2go modules
+# Python X2Go modules
from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES as _X2GO_SESSIONPROFILES_CONFIGFILES
from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS as _X2GO_SESSIONPROFILE_DEFAULTS
from x2go.defaults import X2GO_DESKTOPSESSIONS as _X2GO_DESKTOPSESSIONS
@@ -221,7 +221,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
if key in self.defaultSessionProfile:
self.update_value(profile_id, key, value)
else:
- raise X2goProfileException('keyword ,,%s\'\' not supported in X2go session profile' % key)
+ raise X2goProfileException('keyword ,,%s\'\' not supported in X2Go session profile' % key)
for key, value in self.defaultSessionProfile.items():
if key in kwargs: continue
diff --git a/x2go/backends/profiles/_gconf.py b/x2go/backends/profiles/_gconf.py
index d8c689c..df71401 100644
--- a/x2go/backends/profiles/_gconf.py
+++ b/x2go/backends/profiles/_gconf.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -20,7 +20,7 @@
"""\
L{X2goSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2go based
+L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -28,7 +28,7 @@ __NAME__ = 'x2gosessionprofiles-pylib'
import copy
-# Python X2go modules
+# Python X2Go modules
from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES
from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
import x2go.inifiles as inifiles
diff --git a/x2go/backends/profiles/_httpsbroker.py b/x2go/backends/profiles/_httpsbroker.py
index f46672b..131ee9a 100644
--- a/x2go/backends/profiles/_httpsbroker.py
+++ b/x2go/backends/profiles/_httpsbroker.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -20,7 +20,7 @@
"""\
L{X2goSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2go based
+L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -28,7 +28,7 @@ __NAME__ = 'x2gosessionprofiles-pylib'
import copy
-# Python X2go modules
+# Python X2Go modules
from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES
from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
import x2go.inifiles as inifiles
diff --git a/x2go/backends/profiles/_winreg.py b/x2go/backends/profiles/_winreg.py
index bc0f043..4440718 100644
--- a/x2go/backends/profiles/_winreg.py
+++ b/x2go/backends/profiles/_winreg.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -20,7 +20,7 @@
"""\
L{X2goSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2go based
+L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -28,7 +28,7 @@ __NAME__ = 'x2gosessionprofiles-pylib'
import copy
-# Python X2go modules
+# Python X2Go modules
from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES
from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
import x2go.inifiles as inifiles
diff --git a/x2go/backends/proxy/__init__.py b/x2go/backends/proxy/__init__.py
index 8880a45..8f648be 100644
--- a/x2go/backends/proxy/__init__.py
+++ b/x2go/backends/proxy/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index cbcb6a2..bd2d42f 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -32,7 +32,7 @@ import time
import copy
import threading
-# Python X2go modules
+# Python X2Go modules
import x2go.forward as forward
import x2go.utils as utils
import x2go.log as log
@@ -42,7 +42,7 @@ from x2go.defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
class X2goProxyNX3(base.X2goProxyBASE):
"""\
- X2goNX3Proxy is a NX version 3 based X2go proxy connection class.
+ X2goNX3Proxy is a NX version 3 based X2Go proxy connection class.
It basically fills L{X2goProxyBASE} variables with sensible content. Its
methods mostly wrap around the corresponding methods of the parent class.
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index 90b56b2..5efd1a5 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -33,7 +33,7 @@ import copy
import threading
import cStringIO
-# Python X2go modules
+# Python X2Go modules
import x2go.forward as forward
import x2go.log as log
import x2go.utils as utils
@@ -52,7 +52,7 @@ from x2go.defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR
class X2goProxyBASE(threading.Thread):
"""\
- X2goProxy is an abstract class for X2go proxy connections.
+ X2goProxy is an abstract class for X2Go proxy connections.
This class needs to be inherited from a concrete proxy class. Only
currently available proxy class is: L{X2goProxyNX3}.
@@ -85,7 +85,7 @@ class X2goProxyBASE(threading.Thread):
@type ssh_transport: C{paramiko.Transport} instance
@param session_log: name of the proxy's session logfile
@type session_log: C{str}
- @param sessions_rootdir: base dir where X2go session files are stored (by default: ~/.x2go)
+ @param sessions_rootdir: base dir where X2Go session files are stored (by default: ~/.x2go)
@type sessions_rootdir: C{str}
@param proxy_options: a set of very C{X2goProxy*} backend specific options; any option that is not known
to the C{X2goProxy*} backend will simply be ignored
@@ -132,11 +132,11 @@ class X2goProxyBASE(threading.Thread):
"""
if self.proxy:
- self.logger('Shutting down X2go proxy subprocess', loglevel=log.loglevel_DEBUG)
+ self.logger('Shutting down X2Go proxy subprocess', loglevel=log.loglevel_DEBUG)
try:
self.proxy.kill()
except OSError, e:
- self.logger('X2go proxy shutdown gave a message that we may ignore: %s' % str(e), loglevel=log.loglevel_WARN)
+ self.logger('X2Go proxy shutdown gave a message that we may ignore: %s' % str(e), loglevel=log.loglevel_WARN)
self.proxy = None
if self.fw_tunnel is not None:
self.logger('Shutting down Paramiko/SSH forwarding tunnel', loglevel=log.loglevel_DEBUG)
@@ -159,7 +159,7 @@ class X2goProxyBASE(threading.Thread):
def run(self):
"""\
- Start the X2go proxy command. The X2go proxy command utilizes a
+ Start the X2Go proxy command. The X2Go proxy command utilizes a
Paramiko/SSH based forwarding tunnel (openssh -L option). This tunnel
gets started here and is forked into background (Greenlet/gevent).
diff --git a/x2go/backends/settings/__init__.py b/x2go/backends/settings/__init__.py
index ab6c67d..2b900b4 100644
--- a/x2go/backends/settings/__init__.py
+++ b/x2go/backends/settings/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/settings/_file.py b/x2go/backends/settings/_file.py
index cb8a49c..c35d9af 100644
--- a/x2go/backends/settings/_file.py
+++ b/x2go/backends/settings/_file.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -22,8 +22,8 @@ X2goClientSettings class - managing x2goclient settings file (incl. LDAP-Support
The L{X2goClientSettings} class one of Python X2go's a public API classes.
Use this class (indirectly by retrieving it from an L{X2goClient} instance)
-in your Python X2go based applications to access the
-»settings« configuration file of your X2go client application.
+in your Python X2Go based applications to access the
+»settings« configuration file of your X2Go client application.
"""
__NAME__ = 'x2gosettings-pylib'
@@ -31,7 +31,7 @@ __NAME__ = 'x2gosettings-pylib'
# modules
import os
-# Python X2go modules
+# Python X2Go modules
import x2go.log as log
from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILES
from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
diff --git a/x2go/backends/settings/_gconf.py b/x2go/backends/settings/_gconf.py
index 8ee8aef..38ad5fe 100644
--- a/x2go/backends/settings/_gconf.py
+++ b/x2go/backends/settings/_gconf.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -22,8 +22,8 @@ X2goClientSettings class - managing x2goclient settings file (incl. LDAP-Support
The L{X2goClientSettings} class one of Python X2go's a public API classes.
Use this class (indirectly by retrieving it from an L{X2goClient} instance)
-in your Python X2go based applications to access the
-»settings« configuration file of your X2go client application.
+in your Python X2Go based applications to access the
+»settings« configuration file of your X2Go client application.
"""
__NAME__ = 'x2gosettings-pylib'
@@ -31,7 +31,7 @@ __NAME__ = 'x2gosettings-pylib'
# modules
import os
-# Python X2go modules
+# Python X2Go modules
import x2go.log as log
from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILES
from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
diff --git a/x2go/backends/settings/_winreg.py b/x2go/backends/settings/_winreg.py
index 2e1e633..707aca0 100644
--- a/x2go/backends/settings/_winreg.py
+++ b/x2go/backends/settings/_winreg.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -22,8 +22,8 @@ X2goClientSettings class - managing x2goclient settings file (incl. LDAP-Support
The L{X2goClientSettings} class one of Python X2go's a public API classes.
Use this class (indirectly by retrieving it from an L{X2goClient} instance)
-in your Python X2go based applications to access the
-»settings« configuration file of your X2go client application.
+in your Python X2Go based applications to access the
+»settings« configuration file of your X2Go client application.
"""
__NAME__ = 'x2gosettings-pylib'
@@ -31,7 +31,7 @@ __NAME__ = 'x2gosettings-pylib'
# modules
import os
-# Python X2go modules
+# Python X2Go modules
import x2go.log as log
from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILES
from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
diff --git a/x2go/backends/terminal/__init__.py b/x2go/backends/terminal/__init__.py
index bd6d1e1..78fbe0b 100644
--- a/x2go/backends/terminal/__init__.py
+++ b/x2go/backends/terminal/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index cf4d7d1..1ea6f9a 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goTerminalSession class - core functions for handling your individual X2go sessions.
+X2goTerminalSession class - core functions for handling your individual X2Go sessions.
-This backend handles X2go server implementations that respond with session infos
+This backend handles X2Go server implementations that respond with session infos
via server-side STDOUT and use NX3 as graphical proxy.
"""
@@ -38,7 +38,7 @@ import copy
import shutil
import Xlib
-# Python X2go modules
+# Python X2Go modules
import x2go.rforward as rforward
import x2go.sftpserver as sftpserver
import x2go.printqueue as printqueue
@@ -88,7 +88,7 @@ def _rewrite_cmd(cmd, params=None):
def _rewrite_blanks(cmd):
- # X2go run command replace X2GO_SPACE_CHAR string with blanks
+ # X2Go run command replace X2GO_SPACE_CHAR string with blanks
if cmd:
cmd = cmd.replace(" ", "X2GO_SPACE_CHAR")
return cmd
@@ -102,7 +102,7 @@ class X2goSessionParams(object):
"""
def rewrite_session_type(self):
"""\
- Rewrite the X2go session type, so that the X2go server
+ Rewrite the X2Go session type, so that the X2Go server
can understand it (C{desktop} -> C{D}).
Also if the object's C{command} property is a known window
@@ -152,19 +152,19 @@ class X2goSessionParams(object):
class X2goTerminalSessionSTDOUT(object):
"""\
- Class for managing X2go sessions on a remote X2go server via Paramiko/SSH.
- With the L{X2goTerminalSessionSTDOUT} class you can start new X2go sessions, resume suspended
+ Class for managing X2Go sessions on a remote X2Go server via Paramiko/SSH.
+ With the L{X2goTerminalSessionSTDOUT} class you can start new X2Go sessions, resume suspended
sessions or suspend resp. terminate currently running sessions on a
- connected X2go server.
+ connected X2Go server.
When suspending or terminating sessions there are two possible ways:
- 1. Initialize an X2go session object, start a new session (or resume)
+ 1. Initialize an X2Go session object, start a new session (or resume)
and use the L{X2goTerminalSessionSTDOUT.suspend()} or L{X2goTerminalSessionSTDOUT.terminate()} method
to suspend/terminate the current session object.
2. Alternatively, you can pass a session name to L{X2goTerminalSessionSTDOUT.suspend()}
or L{X2goTerminalSessionSTDOUT.terminate()}. If a session of this name exists on the
- X2go server the respective action will be performed on the session.
+ X2Go server the respective action will be performed on the session.
An L{X2goTerminalSessionSTDOUT} object uses two main data structure classes:
@@ -172,7 +172,7 @@ class X2goTerminalSessionSTDOUT(object):
constructor method.
- C{X2goServerSessionInfo} backend class: when starting or resuming a session, an object of this class
- will be used to store all information retrieved from the X2go server.
+ will be used to store all information retrieved from the X2Go server.
"""
@@ -197,11 +197,11 @@ class X2goTerminalSessionSTDOUT(object):
session_instance=None,
logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- Initialize an X2go session. With the L{X2goTerminalSessionSTDOUT} class you can start
- new X2go sessions, resume suspended sessions or suspend resp. terminate
- currently running sessions on a connected X2go server.
+ Initialize an X2Go session. With the L{X2goTerminalSessionSTDOUT} class you can start
+ new X2Go sessions, resume suspended sessions or suspend resp. terminate
+ currently running sessions on a connected X2Go server.
- @param geometry: screen geometry of the X2go session. Can be either C{<width>x<height>}
+ @param geometry: screen geometry of the X2Go session. Can be either C{<width>x<height>}
or C{fullscreen}
@type geometry: str
@param depth: color depth in bits (common values: C{16}, C{24})
@@ -211,7 +211,7 @@ class X2goTerminalSessionSTDOUT(object):
@param pack: compression method for NX based session proxying
@type pack: str
@param cache_type: a dummy parameter that is passed to the L{X2goProxyBASE}. In NX Proxy
- (class C{X2goProxyNX3}) this originally is the session name. With X2go it
+ (class C{X2goProxyNX3}) this originally is the session name. With X2Go it
defines the name of the NX cache directory. Best is to leave it untouched.
@type cache_type: str
@param kblayout: keyboard layout, e.g. C{us} (default), C{de}, C{fr}, ...
@@ -223,10 +223,10 @@ class X2goTerminalSessionSTDOUT(object):
@param snd_system: sound system to be used on server (C{none}, C{pulse} (default),
C{arts} (obsolete) or C{esd})
@type snd_system: str
- @param cmd: command to be run on X2go server after session start (only used
+ @param cmd: command to be run on X2Go server after session start (only used
when L{X2goTerminalSessionSTDOUT.start()} is called, ignored on resume, suspend etc.
@type cmd: str
- @param rootdir: X2go session directory, normally C{~/.x2go}
+ @param rootdir: X2Go session directory, normally C{~/.x2go}
@type rootdir: str
@param info_backend: backend for handling storage of server session information
@type info_backend: C{X2goServerSessionInfo*} instance
@@ -384,7 +384,7 @@ class X2goTerminalSessionSTDOUT(object):
def start_sound(self):
"""\
- Initialize Paramiko/SSH reverse forwarding tunnel for X2go sound.
+ Initialize Paramiko/SSH reverse forwarding tunnel for X2Go sound.
Currently supported audio protocols:
@@ -395,12 +395,12 @@ class X2goTerminalSessionSTDOUT(object):
_tunnel = None
if self.reverse_tunnels[self.session_info.name]['snd'][1] is None:
if self.params.snd_system == 'pulse':
- self.logger('initializing PulseAudio sound support in X2go session', loglevel=log.loglevel_INFO)
+ self.logger('initializing PulseAudio sound support in X2Go session', loglevel=log.loglevel_INFO)
###
### PULSEAUDIO
###
if os.path.exists(os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME)):
- # setup pulse client config file on X2go server
+ # setup pulse client config file on X2Go server
cmd_line = "echo 'default-server=127.0.0.1:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \
"echo 'cookie-file=%s/.pulse-cookie'>>%s/.pulse-client.conf" % (self.session_info.remote_container, self.session_info.remote_container)
(stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
@@ -429,7 +429,7 @@ class X2goTerminalSessionSTDOUT(object):
### ESD AUDIO
###
- self.logger('initializing ESD sound support in X2go session', loglevel=log.loglevel_INFO)
+ self.logger('initializing ESD sound support in X2Go session', loglevel=log.loglevel_INFO)
self.control_session._x2go_sftp_put(local_path='%s/.esd_auth' % _LOCAL_HOME, remote_path='%s/.esd_auth' % self.control_session._x2go_remote_home)
# start reverse SSH tunnel for pulse stream
@@ -453,7 +453,7 @@ class X2goTerminalSessionSTDOUT(object):
def start_sshfs(self):
"""\
- Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing.
+ Initialize Paramiko/SSH reverse forwarding tunnel for X2Go folder sharing.
"""
if not self.control_session.is_folder_sharing_available():
@@ -488,21 +488,21 @@ class X2goTerminalSessionSTDOUT(object):
def stop_sound(self):
"""\
- Shutdown (pause) Paramiko/SSH reverse forwarding tunnel for X2go sound.
+ Shutdown (pause) Paramiko/SSH reverse forwarding tunnel for X2Go sound.
"""
self._x2go_pause_rev_fw_tunnel('snd')
def stop_sshfs(self):
"""\
- Shutdown (pause) Paramiko/SSH reverse forwarding tunnel for X2go folder sharing.
+ Shutdown (pause) Paramiko/SSH reverse forwarding tunnel for X2Go folder sharing.
"""
self._x2go_pause_rev_fw_tunnel('sshfs')
def start_printing(self):
"""\
- Initialize X2go print spooling.
+ Initialize X2Go print spooling.
"""
if not self.control_session.is_folder_sharing_available():
@@ -533,7 +533,7 @@ class X2goTerminalSessionSTDOUT(object):
def stop_printing(self):
"""\
- Shutdown (pause) the X2go Print Queue thread.
+ Shutdown (pause) the X2Go Print Queue thread.
"""
if self.print_queue is not None:
@@ -548,7 +548,7 @@ class X2goTerminalSessionSTDOUT(object):
def start_mimebox(self, mimebox_extensions=[], mimebox_action=None):
"""\
- Initialize X2go mimebox handling.
+ Initialize X2Go mimebox handling.
"""
if not self.control_session.is_folder_sharing_available():
@@ -578,7 +578,7 @@ class X2goTerminalSessionSTDOUT(object):
def stop_mimebox(self):
"""\
- Shutdown (pause) the X2go MIME box Queue thread.
+ Shutdown (pause) the X2Go MIME box Queue thread.
"""
if self.mimebox_queue is not None:
@@ -593,16 +593,16 @@ class X2goTerminalSessionSTDOUT(object):
def share_local_folder(self, local_path=None, folder_type='disk'):
"""\
- Share a local folder with the X2go session.
+ Share a local folder with the X2Go session.
@param local_path: the full path to an existing folder on the local
file system
@type local_path: str
@param folder_type: one of 'disk' (a folder on your local hard drive), 'rm' (removeable device),
- 'cdrom' (CD/DVD Rom) or 'spool' (for X2go print spooling)
+ 'cdrom' (CD/DVD Rom) or 'spool' (for X2Go print spooling)
@type folder_type: str
- @return: returns C{True} if the local folder has been successfully mounted within the X2go server session
+ @return: returns C{True} if the local folder has been successfully mounted within the X2Go server session
@rtype: bool
"""
@@ -699,9 +699,9 @@ class X2goTerminalSessionSTDOUT(object):
def unshare_all_local_folders(self):
"""\
- Unshare all local folders mount in the X2go session.
+ Unshare all local folders mount in the X2Go session.
- @return: returns C{True} if all local folders could be successfully unmounted from the X2go server session
+ @return: returns C{True} if all local folders could be successfully unmounted from the X2Go server session
@rtype: bool
"""
@@ -722,9 +722,9 @@ class X2goTerminalSessionSTDOUT(object):
def unshare_local_folder(self, local_path):
"""\
- Unshare local folder given as <local_path> from X2go session.
+ Unshare local folder given as <local_path> from X2Go session.
- @return: returns C{True} if the local folder <local_path> could be successfully unmounted from the X2go server session
+ @return: returns C{True} if the local folder <local_path> could be successfully unmounted from the X2Go server session
@rtype: bool
"""
@@ -861,7 +861,7 @@ class X2goTerminalSessionSTDOUT(object):
def has_command(self, cmd):
"""\
- Verify if the command <cmd> exists on the X2go server.
+ Verify if the command <cmd> exists on the X2Go server.
"""
test_cmd = None;
@@ -894,13 +894,13 @@ class X2goTerminalSessionSTDOUT(object):
After L{X2goTerminalSessionSTDOUT.start()} has been called
one or more commands can be executed with L{X2goTerminalSessionSTDOUT.run_command()}
- within the current X2go session.
+ within the current X2Go session.
@param cmd: Command to be run
@type cmd: str
@return: stdout.read() and stderr.read() as returned by the run command
- on the X2go server
+ on the X2Go server
@rtype: tuple of str
"""
@@ -953,10 +953,10 @@ class X2goTerminalSessionSTDOUT(object):
def ok(self):
"""\
- Returns C{True} if this X2go session is up and running,
+ Returns C{True} if this X2Go session is up and running,
C{False} else
- @return: X2go session OK?
+ @return: X2Go session OK?
@rtype: bool
"""
@@ -964,10 +964,10 @@ class X2goTerminalSessionSTDOUT(object):
def is_running(self):
"""\
- Returns C{True} if this X2go session is in running state,
+ Returns C{True} if this X2Go session is in running state,
C{False} else.
- @return: X2go session running?
+ @return: X2Go session running?
@rtype: bool
"""
@@ -975,10 +975,10 @@ class X2goTerminalSessionSTDOUT(object):
def is_suspended(self):
"""\
- Returns C{True} if this X2go session is in suspended state,
+ Returns C{True} if this X2Go session is in suspended state,
C{False} else.
- @return: X2go session suspended?
+ @return: X2Go session suspended?
@rtype: bool
"""
@@ -986,17 +986,17 @@ class X2goTerminalSessionSTDOUT(object):
def is_connected(self):
"""\
- Returns C{True} if this X2go session's Paramiko/SSH transport is
+ Returns C{True} if this X2Go session's Paramiko/SSH transport is
connected/authenticated, C{False} else.
- @return: X2go session connected?
+ @return: X2Go session connected?
@rtype: bool
"""
return self.control_session.is_connected()
def start(self):
"""\
- Start a new X2go session.
+ Start a new X2Go session.
The L{X2goTerminalSession.start()} method accepts any parameter
that can be passed to the class constructor.
@@ -1037,9 +1037,9 @@ class X2goTerminalSessionSTDOUT(object):
_stderr = stderr.read()
# if the first line of stdout is a "DEN(Y)" string then we will presume that
- # we tried to use X2go desktop sharing and the sharing was rejected
+ # we tried to use X2Go desktop sharing and the sharing was rejected
if "ACCESS DENIED" in _stderr and "XSHAD" in _stderr:
- raise x2go_exceptions.X2goDesktopSharingException('X2go desktop sharing has been denied by the remote user')
+ raise x2go_exceptions.X2goDesktopSharingException('X2Go desktop sharing has been denied by the remote user')
try:
self.session_info.initialize(_stdout,
@@ -1047,9 +1047,9 @@ class X2goTerminalSessionSTDOUT(object):
hostname=self.control_session.get_transport().getpeername(),
)
except ValueError:
- raise x2go_exceptions.X2goTerminalSessionException("failed to start X2go session")
+ raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session")
except IndexError:
- raise x2go_exceptions.X2goTerminalSessionException("failed to start X2go session")
+ raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session")
# local path may be a Windows path, so we use the path separator of the local system
self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
@@ -1080,7 +1080,7 @@ class X2goTerminalSessionSTDOUT(object):
def resume(self):
"""\
- Resume a running/suspended X2go session.
+ Resume a running/suspended X2Go session.
The L{X2goTerminalSessionSTDOUT.resume()} method accepts any parameter
that can be passed to the class constructor.
@@ -1130,7 +1130,7 @@ class X2goTerminalSessionSTDOUT(object):
def suspend(self):
"""\
- Suspend this X2go session terminal.
+ Suspend this X2Go session terminal.
@return: True if the session terminal could be successfully suspended
@rtype: bool
@@ -1146,7 +1146,7 @@ class X2goTerminalSessionSTDOUT(object):
def terminate(self):
"""\
- Terminate this X2go session.
+ Terminate this X2Go session.
@return: True if the session terminal could be successfully terminate
@rtype: bool
diff --git a/x2go/cache.py b/x2go/cache.py
index ec89093..4b99696 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goListSessionCache class - caching X2go session information.
+X2goListSessionCache class - caching X2Go session information.
"""
__NAME__ = 'x2gocache-pylib'
@@ -27,7 +27,7 @@ __NAME__ = 'x2gocache-pylib'
import copy
import gevent
-# Python X2go modules
+# Python X2Go modules
import log
import x2go_exceptions
@@ -39,7 +39,7 @@ class X2goListSessionsCache(object):
The session list and desktop cache gets updated in regular intervals by a threaded
L{X2goSessionGuardian} instance. For the session list and desktop list update, the
- X2go server commands C{x2golistsessions} and C{x2godesktopsessions} are called and
+ X2Go server commands C{x2golistsessions} and C{x2godesktopsessions} are called and
the command's stdout is cached in the session list cache.
Whenever your client application needs access to either the server's session list
@@ -189,7 +189,7 @@ class X2goListSessionsCache(object):
@param session_uuid: unique identifier of session to query cache for
@type session_uuid: C{str}
- @return: a list of strings representing X2go desktop sessions available for sharing
+ @return: a list of strings representing X2Go desktop sessions available for sharing
@rtype: C{list}
"""
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index 79a3bd9..a94ce78 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -28,7 +28,7 @@ import paramiko
import binascii
import uuid
-# Python X2go modules
+# Python X2Go modules
import sshproxy
import log
import x2go_exceptions
@@ -37,7 +37,7 @@ import string
class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
"""\
- Policy for making host key information available to Python X2go after a
+ Policy for making host key information available to Python X2Go after a
Paramiko/SSH connect has been attempted. This class needs information
about the associated L{X2goSession} instance.
@@ -55,7 +55,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
"""\
@param caller: calling instance
@type caller: C{class}
- @param session_instance: an X2go session instance
+ @param session_instance: an X2Go session instance
@type session_instance: L{X2goSession} instance
"""
@@ -92,7 +92,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' %
(self.key.get_name(), self.hostname, binascii.hexlify(self.key.get_fingerprint())))
if self.session_instance:
- self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
+ self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
_valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(),
port=self.get_hostname_port(),
fingerprint=self.get_key_fingerprint_with_colons(),
@@ -112,7 +112,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
"""\
Retrieve the Paramiko SSH/Client.
- @return: the associated X2go control session instance.
+ @return: the associated X2Go control session instance.
@rtype: C{X2goControlSession*} instance
"""
diff --git a/x2go/cleanup.py b/x2go/cleanup.py
index abb23db..760a242 100644
--- a/x2go/cleanup.py
+++ b/x2go/cleanup.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-A recommended X2go session clean up helper function.
+A recommended X2Go session clean up helper function.
"""
@@ -26,7 +26,7 @@ import gevent
import paramiko
import threading
-# Python X2go modules
+# Python X2Go modules
import guardian
import rforward
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
@@ -37,7 +37,7 @@ if _X2GOCLIENT_OS == 'Windows':
def x2go_cleanup(e=None, threads=None):
"""\
- For every Python X2go application you write, please make sure to
+ For every Python X2Go application you write, please make sure to
capture the C{KeyboardInterrupt} and the C{SystemExit} exceptions and
call this function if either of the exceptions occurs.
@@ -68,13 +68,13 @@ def x2go_cleanup(e=None, threads=None):
else:
threads = threads
- # stop X2go reverse forwarding tunnels
+ # stop X2Go reverse forwarding tunnels
for t in threads:
if type(t) == rforward.X2goRevFwTunnel:
t.stop_thread()
del t
- # stop X2go paramiko transports used by X2goTerminalSession objects
+ # stop X2Go paramiko transports used by X2goTerminalSession objects
for t in threads:
if type(t) == paramiko.Transport:
if hasattr(t, '_x2go_session_marker'):
@@ -101,7 +101,7 @@ def x2go_cleanup(e=None, threads=None):
raise e
except KeyboardInterrupt:
- # do not allow keyboard interrupts during Python X2go cleanup
+ # do not allow keyboard interrupts during Python X2Go cleanup
pass
except SystemExit:
# neither do we allow SIGTERM signals during cleanup...
diff --git a/x2go/client.py b/x2go/client.py
index 6853447..5791584 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -19,7 +19,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goClient} is a public API class. Use this class in your Python X2go based
+L{X2goClient} is a public API class. Use this class in your Python X2Go based
applications. Use it as a parent class for your own object oriented L{X2goClient}'ish
class implementation.
@@ -27,25 +27,25 @@ Supported Features
==================
Supported features are:
- - X2go multi-session management
+ - X2Go multi-session management
- keep track of initiated sessions
- - grant access to X2go client config files: C{settings}, C{printing}, C{sessions}
+ - grant access to X2Go client config files: C{settings}, C{printing}, C{sessions}
and C{xconfig} (Windows only) as normally found in C{~/.x2goclient}
- - instantiate an X2go session by a set of Python parameters
+ - instantiate an X2Go session by a set of Python parameters
- load a session profile from x2goclient's C{sessions} configuration file
and start the---profile-based pre-configured---session
- - sharing of local folders with remote X2go sessions
- - enabling and mangaging X2go printing (real printing, viewing as PDF, saving
+ - sharing of local folders with remote X2Go sessions
+ - enabling and mangaging X2Go printing (real printing, viewing as PDF, saving
to a local folder or executing a custom »print« command
- transparent tunneling of audio (Pulseaudio, ESD)
- - LDAP support for X2go server clusters (NOT IMPLEMENTED YET)
+ - LDAP support for X2Go server clusters (NOT IMPLEMENTED YET)
Non-Profile Sessions
====================
- A new non-profile based X2go session within an L{X2goClient} instance is setup in the
+ A new non-profile based X2Go session within an L{X2goClient} instance is setup in the
following way:
- - import the Python X2go module and call the session constructor::
+ - import the Python X2Go module and call the session constructor::
import x2go
x2go_client = x2go.X2goClient()
@@ -55,12 +55,12 @@ Non-Profile Sessions
x2go_sess_uuid = x2go_client.register_session(<many-options>)
- - connect to the session's remote X2go server (SSH/Paramiko)::
+ - connect to the session's remote X2Go server (SSH/Paramiko)::
x2go_client.connect_session(x2go_sess_uuid)
- - via the connected X2go client session you can start or resume a remote
- X-windows session on an X2go server now::
+ - via the connected X2Go client session you can start or resume a remote
+ X-windows session on an X2Go server now::
x2go_client.start_session(x2go_sess_uuid)
@@ -75,10 +75,10 @@ Non-Profile Sessions
Profiled Sessions
=================
- A new profile based X2go session (i.e. using pre-defined session profiles) within an
+ A new profile based X2Go session (i.e. using pre-defined session profiles) within an
L{X2goClient} instance is setup in a much easier way:
- - import the Python X2go module and call the session constructor::
+ - import the Python X2Go module and call the session constructor::
import x2go
x2go_client = x2go.X2goClient()
@@ -124,7 +124,7 @@ import types
import os
import gevent
-# Python X2go modules
+# Python X2Go modules
from registry import X2goSessionRegistry
from guardian import X2goSessionGuardian
from cache import X2goListSessionsCache
@@ -168,11 +168,11 @@ if _X2GOCLIENT_OS == 'Windows':
class X2goClient(object):
"""\
- The X2goClient implements _THE_ public Python X2go API. With it you can
- construct your own X2go client application in Python.
+ The X2goClient implements _THE_ public Python X2Go API. With it you can
+ construct your own X2Go client application in Python.
Most methods in this class require that you have registered a session
- with a remote X2go server (passing of session options, initialization of the
+ with a remote X2Go server (passing of session options, initialization of the
session object etc.) and connected to it (authentication). For these two steps
use these methods: L{X2goClient.register_session()} and L{X2goClient.connect_session()}.
@@ -200,21 +200,21 @@ class X2goClient(object):
pulseaudio_installdir=os.path.join(os.getcwd(), 'pulseaudio'),
logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param control_backend: X2go control session backend to use
+ @param control_backend: X2Go control session backend to use
@type control_backend: C{class}
- @param terminal_backend: X2go terminal session backend to use
+ @param terminal_backend: X2Go terminal session backend to use
@type terminal_backend: C{class}
- @param info_backend: X2go session info backend to use
+ @param info_backend: X2Go session info backend to use
@type info_backend: C{class}
- @param list_backend: X2go session list backend to use
+ @param list_backend: X2Go session list backend to use
@type list_backend: C{class}
- @param proxy_backend: X2go proxy backend to use
+ @param proxy_backend: X2Go proxy backend to use
@type proxy_backend: C{class}
- @param profiles_backend: X2go session profiles backend to use
+ @param profiles_backend: X2Go session profiles backend to use
@type profiles_backend: C{class}
- @param settings_backend: X2go client settings backend to use
+ @param settings_backend: X2Go client settings backend to use
@type settings_backend: C{class}
- @param printing_backend: X2go client printing backend to use
+ @param printing_backend: X2Go client printing backend to use
@type printing_backend: C{class}
@param client_rootdir: client base dir (default: ~/.x2goclient)
@type client_rootdir: C{str}
@@ -226,15 +226,15 @@ class X2goClient(object):
@type start_xserver: C{bool}
@param start_pulseaudio: start Pulseaudio daemon when registering an L{X2goClient} instance
@type start_pulseaudio: C{bool}
- @param use_listsessions_cache: activate the X2go session list cache in (L{X2goListSessionsCache})
+ @param use_listsessions_cache: activate the X2Go session list cache in (L{X2goListSessionsCache})
@type use_listsessions_cache: C{bool}
- @param auto_update_listsessions_cache: activate automatic updates of the X2go session list cache (L{X2goListSessionsCache})
+ @param auto_update_listsessions_cache: activate automatic updates of the X2Go session list cache (L{X2goListSessionsCache})
@type auto_update_listsessions_cache: C{bool}
@param auto_update_listdesktops_cache: activate automatic updates of desktop lists in (L{X2goListSessionsCache})
@type auto_update_listdesktops_cache: C{bool}
- @param auto_update_sessionregistry: activate automatic updates of the X2go session registry
+ @param auto_update_sessionregistry: activate automatic updates of the X2Go session registry
@type auto_update_sessionregistry: C{bool}
- @param auto_register_sessions: activate automatic X2go session registration
+ @param auto_register_sessions: activate automatic X2Go session registration
@type auto_register_sessions: C{bool}
@param refresh_interval: refresh session list cache and session status every C{<refresh_interval>} seconds
@type refresh_interval: C{int}
@@ -338,11 +338,11 @@ class X2goClient(object):
def HOOK_no_known_xserver_found(self):
"""\
- HOOK method: called if the Python X2go module could not find any usable XServer
- application to start. You will not be able to start X2go sessions without an XServer.
+ HOOK method: called if the Python X2Go module could not find any usable XServer
+ application to start. You will not be able to start X2Go sessions without an XServer.
"""
- self.logger('the Python X2go module could not find any usable XServer application, you will not be able to start X2go sessions without an XServer', loglevel=log.loglevel_WARN)
+ self.logger('the Python X2Go module could not find any usable XServer application, you will not be able to start X2Go sessions without an XServer', loglevel=log.loglevel_WARN)
def HOOK_open_print_dialog(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
@@ -351,7 +351,7 @@ class X2goClient(object):
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -359,17 +359,17 @@ class X2goClient(object):
def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
- HOOK: the command <cmd> is not available on the connected X2go server.
+ HOOK: the command <cmd> is not available on the connected X2Go server.
@param cmd: the command that failed
@type cmd: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
- self.logger('HOOK_no_such_command: the command %s is not available for X2go server (profile: %s, session: %s)' % (cmd, profile_name, session_name), loglevel=log.loglevel_WARN)
+ self.logger('HOOK_no_such_command: the command %s is not available for X2Go server (profile: %s, session: %s)' % (cmd, profile_name, session_name), loglevel=log.loglevel_WARN)
def HOOK_open_mimebox_saveas_dialog(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
@@ -379,7 +379,7 @@ class X2goClient(object):
@type filename: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -393,7 +393,7 @@ class X2goClient(object):
@type filename: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
@param err_msg: if available, an appropriate error message
@type err_msg: C{str}
@@ -456,11 +456,11 @@ class X2goClient(object):
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
- self.logger('HOOK_on_sound_tunnel_failed: setting up X2go sound for %s (%s) support failed' % (profile_name, session_name))
+ self.logger('HOOK_on_sound_tunnel_failed: setting up X2Go sound for %s (%s) support failed' % (profile_name, session_name))
def HOOK_rforward_request_denied(self, profile_name='UNKNOWN', session_name='UNKNOWN', server_port=0):
"""\
@@ -468,13 +468,13 @@ class X2goClient(object):
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
@param server_port: remote server port (starting point of reverse forwarding tunnel)
@type server_port: C{str}
"""
- self.logger('TCP port (reverse) forwarding request for session %s to server port %s has been denied by the X2go server. This is a common issue with SSH, it might help to restart the X2go server\'s SSH daemon.' % (session_name, server_port), loglevel=log.loglevel_WARN)
+ self.logger('TCP port (reverse) forwarding request for session %s to server port %s has been denied by the X2Go server. This is a common issue with SSH, it might help to restart the X2Go server\'s SSH daemon.' % (session_name, server_port), loglevel=log.loglevel_WARN)
def HOOK_forwarding_tunnel_setup_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', chain_host='UNKNOWN', chain_port=0):
"""\
@@ -482,7 +482,7 @@ class X2goClient(object):
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
@param chain_host: hostname of chain host (forwarding tunnel end point)
@type chain_host: C{str}
@@ -500,7 +500,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -514,7 +514,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -528,7 +528,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -542,7 +542,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -556,7 +556,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -570,7 +570,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -584,7 +584,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param profile_name: profile name of session that called this hook method
@type profile_name: C{str}
- @param session_name: X2go session name
+ @param session_name: X2Go session name
@type session_name: C{str}
"""
@@ -683,7 +683,7 @@ class X2goClient(object):
"""\
Retrieve the settings root directory of this L{X2goClient} instance.
- @return: X2go client root directory
+ @return: X2Go client root directory
@rtype: C{str}
"""
return self.client_rootdir
@@ -703,7 +703,7 @@ class X2goClient(object):
"""\
Retrieve the sessions root directory of this L{X2goClient} instance.
- @return: X2go sessions root directory
+ @return: X2Go sessions root directory
@rtype: C{str}
"""
return self.sessions_rootdir
@@ -721,7 +721,7 @@ class X2goClient(object):
def get_client_username(self):
"""\
- Query the local user's username (i.e. the user running the X2go client).
+ Query the local user's username (i.e. the user running the X2Go client).
@return: the local username this L{X2goClient} instance runs as
@rtype: C{str}
@@ -733,7 +733,7 @@ class X2goClient(object):
def register_all_session_profiles(self, return_objects=False):
"""\
Register all session profiles found in the C{sessions} configuration node
- as potential X2go sessions.
+ as potential X2Go sessions.
@param return_objects: if set to C{True} this methods returns a list of L{X2goSession}
instances, otherwise a list of session UUIDs representing the corresponding
@@ -762,7 +762,7 @@ class X2goClient(object):
"""\
Register a new L{X2goSession}. Within one L{X2goClient}
instance you can manage several L{X2goSession} instances on serveral
- remote X2go servers under different user names.
+ remote X2Go servers under different user names.
These sessions can be instantiated by passing direct L{X2goSession}
parameters to this method or by specifying the name of an existing session profile
@@ -773,7 +773,7 @@ class X2goClient(object):
profiles are stored as a file (by default: C{~/.x2goclient/sessions} or globally (for all users on the
client) in C{/etc/x2goclient/sessions}).
- Python X2go also supports starting multiple X2go sessions for the same
+ Python X2Go also supports starting multiple X2Go sessions for the same
session profile simultaneously.
This method (L{X2goClient.register_session()}) accepts a similar set of parameters
@@ -781,13 +781,13 @@ class X2goClient(object):
there.
Alternatively, you can also pass a profile name or a profile id
- to this method. If you do this, Python X2go tries to find the specified session
+ to this method. If you do this, Python X2Go tries to find the specified session
in the C{sessions} configuration node and then derives the necessary session parameters
from the session profile configuration. Additional L{X2goSession} parameters can
also be passed to this method---they will override the option values retrieved from
the session profile.
- @param server: hostname of the remote X2go server
+ @param server: hostname of the remote X2Go server
@type server: C{str}
@param profile_id: id (config section name) of a session profile to load
from your session config
@@ -795,14 +795,14 @@ class X2goClient(object):
@param profile_name: name of a session profile to load from your session
config
@type profile_name: C{str}
- @param allow_printing: enable X2go printing support for the to-be-registered X2go session
+ @param allow_printing: enable X2Go printing support for the to-be-registered X2Go session
@type allow_printing: C{bool}
@param allow_share_local_folders: set local folder sharing to enabled/disabled
@type allow_share_local_folders: C{bool}
@param share_local_folders: a list of local folders (as strings) to be shared directly
after session start up
@type share_local_folders: C{list}
- @param allow_mimebox: enable X2go MIME box support for the to-be-registered X2go session
+ @param allow_mimebox: enable X2Go MIME box support for the to-be-registered X2Go session
@type allow_mimebox: C{bool}
@param mimebox_extensions: MIME box support is only allowed for the given file extensions
@type mimebox_extensions: C{list}
@@ -823,7 +823,7 @@ class X2goClient(object):
@param kwargs: any option that is also valid for the L{X2goSession} constructor
@type kwargs: C{dict}
- @return: a unique identifier (UUID) for the newly registered X2go session (or an
+ @return: a unique identifier (UUID) for the newly registered X2Go session (or an
X2goSession object if C{return_object} is set to True
@rtype: C{str}
@@ -887,7 +887,7 @@ class X2goClient(object):
known_hosts=known_hosts,
**_params)
- self.logger('initializing X2go session...', log.loglevel_NOTICE, tag=self._logger_tag)
+ self.logger('initializing X2Go session...', log.loglevel_NOTICE, tag=self._logger_tag)
if return_object:
return self.session_registry(session_uuid)
else:
@@ -902,7 +902,7 @@ class X2goClient(object):
"""\
Retrieves a Python dictionary, containing a short session summary (session status, names, etc.)
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
@@ -917,10 +917,10 @@ class X2goClient(object):
After an L{X2goSession} has been set up you can query the
username that the remote sessions runs as.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: the remote username the X2go session runs as
+ @return: the remote username the X2Go session runs as
@rtype: C{str}
"""
@@ -933,10 +933,10 @@ class X2goClient(object):
hostname of the host the session is connected to (or
about to connect to).
- @param session_uuid: the X2go sessions UUID registry hash
+ @param session_uuid: the X2Go sessions UUID registry hash
@type session_uuid: C{str}
- @return: the host an X2go session is connected to
+ @return: the host an X2Go session is connected to
(as an C{(addr,port)} tuple)
@rtype: tuple
@@ -950,10 +950,10 @@ class X2goClient(object):
application (e.g. like it has been specified in the session
profile).
- @param session_uuid: the X2go sessions UUID registry hash
+ @param session_uuid: the X2Go sessions UUID registry hash
@type session_uuid: C{str}
- @return: the hostname for the queried X2go session as specified
+ @return: the hostname for the queried X2Go session as specified
by the calling application
@rtype: str
@@ -966,7 +966,7 @@ class X2goClient(object):
Retrieve the complete L{X2goSession} object that has been
registered under the given session registry hash.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: the L{X2goSession} instance
@@ -983,12 +983,12 @@ class X2goClient(object):
Retrieve session UUID or L{X2goSession} for session name
<session_name> from the session registry.
- @param session_name: the X2go session's UUID registry hash
+ @param session_name: the X2Go session's UUID registry hash
@type session_name: C{str}
@param return_object: session UUID hash or L{X2goSession} instance wanted?
@type return_object: C{bool}
- @return: the X2go session's UUID registry hash or L{X2goSession} instance
+ @return: the X2Go session's UUID registry hash or L{X2goSession} instance
@rtype: C{str} or L{X2goSession} instance
"""
@@ -1000,13 +1000,13 @@ class X2goClient(object):
def get_session_name(self, session_uuid):
"""\
- Retrieve the server-side X2go session name for the session that has
+ Retrieve the server-side X2Go session name for the session that has
been registered under C{session_uuid}.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: X2go session name
+ @return: X2Go session name
@rtype: C{str}
"""
@@ -1018,7 +1018,7 @@ class X2goClient(object):
Set the session username for the L{X2goSession} that has been registered under C{session_uuid}.
This can be helpful for modifying user credentials during an authentication phase.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param username: new user name to be used for session authentication
@type username: C{str}
@@ -1031,9 +1031,9 @@ class X2goClient(object):
def check_session_host(self, session_uuid):
"""\
- Provide a mechanism to evaluate the validity of an X2go server host.
+ Provide a mechanism to evaluate the validity of an X2Go server host.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: return C{True} if host validation has been successful.
@@ -1060,7 +1060,7 @@ class X2goClient(object):
Check if the SSH proxy of session with unique identifier <session_uuid> is configured adequately
to be able to auto-connect to the SSH proxy server (e.g. by public key authentication).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: returns C{True} if the session's SSH proxy can auto-connect, C{False} otherwise, C{None}
@@ -1074,9 +1074,9 @@ class X2goClient(object):
def session_can_auto_connect(self, session_uuid):
"""\
Check if session with unique identifier <session_uuid> is configured adequately
- to be able to auto-connect to the X2go server (e.g. by public key authentication).
+ to be able to auto-connect to the X2Go server (e.g. by public key authentication).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: returns C{True} if the session can auto-connect, C{False} otherwise, C{None}
@@ -1095,15 +1095,15 @@ class X2goClient(object):
add_to_known_hosts=False,
force_password_auth=False):
"""\
- Connect to a registered X2go session with registry hash C{<session_uuid>}.
+ Connect to a registered X2Go session with registry hash C{<session_uuid>}.
This method basically wraps around paramiko.SSHClient.connect() for the
corresponding session.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param username: user name to be used for session authentication
@type username: C{str}
- @param password: the user's password for the X2go server that is going to be
+ @param password: the user's password for the X2Go server that is going to be
connected to
@type password: C{str}
@param sshproxy_user: user name to be used for SSH proxy authentication
@@ -1138,7 +1138,7 @@ class X2goClient(object):
"""\
Disconnect an L{X2goSession} by closing down its Paramiko/SSH Transport thread.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
self.session_registry(session_uuid).disconnect()
@@ -1148,7 +1148,7 @@ class X2goClient(object):
def set_session_print_action(self, session_uuid, print_action, **kwargs):
"""\
- If X2go client-side printing is enable within an X2go session you can use
+ If X2Go client-side printing is enable within an X2Go session you can use
this method to alter the way how incoming print spool jobs are handled/processed.
Currently, there are five different print actions available, each defined as an individual
@@ -1169,7 +1169,7 @@ class X2goClient(object):
information on these print action arguments please refer to the constructor methods of
each class individually.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param print_action: one of the named above print actions, either as string or class instance
@type print_action: C{str} or C{instance}
@@ -1188,7 +1188,7 @@ class X2goClient(object):
given title, it will be prepended, so that every X2Go session window
always contains the X2Go session ID of that window.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param title: new title for session window
@type title: C{str}
@@ -1202,7 +1202,7 @@ class X2goClient(object):
Try to lift the session window above all other windows and bring
it to focus.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
self.session_registry(session_uuid).raise_session_window()
@@ -1210,15 +1210,15 @@ class X2goClient(object):
def start_session(self, session_uuid):
"""\
- Start a new X2go session on the remote X2go server. This method
- will open---if everything has been successful till here---the X2go
+ Start a new X2Go session on the remote X2Go server. This method
+ will open---if everything has been successful till here---the X2Go
session window.
Before calling this method you have to register your desired session
with L{register_session} (initialization of session parameters) and
connect to it with L{connect_session} (authentication).
- @param session_uuid: the X2go sessions UUID registry hash
+ @param session_uuid: the X2Go sessions UUID registry hash
@type session_uuid: C{str}
@return: returns True if this method has been successful
@@ -1281,13 +1281,13 @@ class X2goClient(object):
def resume_session(self, session_uuid=None, session_name=None):
"""\
- Resume or continue a suspended / running X2go session on a
- remote X2go server (as specified when L{register_session} was
+ Resume or continue a suspended / running X2Go session on a
+ remote X2Go server (as specified when L{register_session} was
called).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param session_name: the server-side name of an X2go session
+ @param session_name: the server-side name of an X2Go session
@type session_name: C{str}
@return: returns True if this method has been successful
@@ -1312,7 +1312,7 @@ class X2goClient(object):
def suspend_session(self, session_uuid, session_name=None):
"""\
- Suspend an X2go session.
+ Suspend an X2Go session.
Normally, you will use this method to suspend a registered session that you
have formerly started/resumed from within your recent
@@ -1320,16 +1320,16 @@ class X2goClient(object):
using the sessions C{session_uuid}, leave the C{session_name}
empty.
- Alternatively, you can suspend a non-associated X2go session:
+ Alternatively, you can suspend a non-associated X2Go session:
To do this you simply neeed to register (with the L{register_session}
- method) an X2go session on the to-be-addressed remote X2go server and
+ method) an X2Go session on the to-be-addressed remote X2Go server and
connect (L{connect_session}) to it. Then call this method with
- the freshly obtained C{session_uuid} and the remote X2go session
+ the freshly obtained C{session_uuid} and the remote X2Go session
name (as shown e.g. in x2golistsessions output).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param session_name: the server-side name of an X2go session (for
+ @param session_name: the server-side name of an X2Go session (for
non-associated session suspend)
@type session_name: C{str}
@@ -1353,7 +1353,7 @@ class X2goClient(object):
def terminate_session(self, session_uuid, session_name=None):
"""\
- Terminate an X2go session.
+ Terminate an X2Go session.
Normally you will use this method to terminate a registered session that you
have formerly started/resumed from within your recent
@@ -1361,16 +1361,16 @@ class X2goClient(object):
using the sessions C{session_uuid}, leave the C{session_name}
empty.
- Alternatively, you can terminate a non-associated X2go session:
+ Alternatively, you can terminate a non-associated X2Go session:
To do this you simply neeed to register (L{register_session})
- an X2go session on the to-be-addressed remote X2go server and
+ an X2Go session on the to-be-addressed remote X2Go server and
connect (L{connect_session}) to it. Then call this method with
- the freshly obtained C{session_uuid} and the remote X2go session
+ the freshly obtained C{session_uuid} and the remote X2Go session
name (as shown in e.g. x2golistsessions output).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param session_name: the server-side name of an X2go session
+ @param session_name: the server-side name of an X2Go session
@type session_name: C{str}
@return: returns True if this method has been successful
@@ -1403,10 +1403,10 @@ class X2goClient(object):
was passed to L{register_session} or it will be the application that
instantiated this L{X2goClient} instance.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: X2go session profile name
+ @return: X2Go session profile name
@rtype: C{str}
"""
@@ -1424,12 +1424,12 @@ class X2goClient(object):
session profile creation/modification).
For non-profile based sessions this will be a timestamp created on
- X2go session registration by C{register_session}.
+ X2Go session registration by C{register_session}.
@param session_uuid: the session profile name
@type session_uuid: C{str}
- @return: the X2go session profile's id
+ @return: the X2Go session profile's id
@rtype: C{str}
"""
@@ -1438,10 +1438,10 @@ class X2goClient(object):
def session_ok(self, session_uuid):
"""\
- Test if the X2go session registered as C{session_uuid} is
+ Test if the X2Go session registered as C{session_uuid} is
in a healthy state.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: C{True} if session is ok, C{False} otherwise
@@ -1453,10 +1453,10 @@ class X2goClient(object):
def is_session_connected(self, session_uuid):
"""\
- Test if the X2go session registered as C{session_uuid} connected
- to the X2go server.
+ Test if the X2Go session registered as C{session_uuid} connected
+ to the X2Go server.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: C{True} if session is connected, C{False} otherwise
@@ -1468,12 +1468,12 @@ class X2goClient(object):
def is_session_running(self, session_uuid, session_name=None):
"""\
- Test if the X2go session registered as C{session_uuid} is up
+ Test if the X2Go session registered as C{session_uuid} is up
and running.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param session_name: the server-side name of an X2go session
+ @param session_name: the server-side name of an X2Go session
@type session_name: C{str}
@return: C{True} if session is running, C{False} otherwise
@@ -1488,12 +1488,12 @@ class X2goClient(object):
def is_session_suspended(self, session_uuid, session_name=None):
"""\
- Test if the X2go session registered as C{session_uuid}
+ Test if the X2Go session registered as C{session_uuid}
is in suspended state.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param session_name: the server-side name of an X2go session
+ @param session_name: the server-side name of an X2Go session
@type session_name: C{str}
@return: C{True} if session is suspended, C{False} otherwise
@@ -1508,12 +1508,12 @@ class X2goClient(object):
def has_session_terminated(self, session_uuid, session_name=None):
"""\
- Test if the X2go session registered as C{session_uuid}
+ Test if the X2Go session registered as C{session_uuid}
has terminated.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param session_name: the server-side name of an X2go session
+ @param session_name: the server-side name of an X2Go session
@type session_name: C{str}
@return: C{True} if session has terminated, C{False} otherwise
@@ -1528,10 +1528,10 @@ class X2goClient(object):
def is_folder_sharing_available(self, session_uuid=None, profile_name=None):
"""\
- Test if local folder sharing is available for X2go session with unique ID <session_uuid> or
+ Test if local folder sharing is available for X2Go session with unique ID <session_uuid> or
session profile <profile_name>.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param profile_name: alternatively, the profile name can be used to perform this query
@type profile_name: C{str}
@@ -1555,13 +1555,13 @@ class X2goClient(object):
def share_local_folder(self, session_uuid=None, local_path=None, profile_name=None, folder_name=None):
"""\
- Share a local folder with the X2go session registered as C{session_uuid}.
+ Share a local folder with the X2Go session registered as C{session_uuid}.
When calling this method the given client-side folder is mounted
- on the X2go server (via sshfs) and (if in desktop mode) provided as a
+ on the X2Go server (via sshfs) and (if in desktop mode) provided as a
desktop icon on your remote session's desktop.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param local_path: the full path to an existing folder on the local (client-side)
file system
@@ -1575,7 +1575,7 @@ class X2goClient(object):
@rtype: C{bool}
"""
- # compat for Python-X2go (<=0.1.1.6)
+ # compat for Python-X2Go (<=0.1.1.6)
if folder_name: local_path = folder_name
if session_uuid is None and profile_name:
@@ -1593,14 +1593,14 @@ class X2goClient(object):
def unshare_all_local_folders(self, session_uuid=None, profile_name=None):
"""\
- Unshare all local folders mounted in X2go session registered as
+ Unshare all local folders mounted in X2Go session registered as
C{session_uuid}.
- When calling this method all client-side mounted folders on the X2go
+ When calling this method all client-side mounted folders on the X2Go
server (via sshfs) for session with ID <session_uuid> will get
unmounted.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param profile_name: alternatively, the profile name can be used to unshare
mounted folders
@@ -1626,14 +1626,14 @@ class X2goClient(object):
def unshare_local_folder(self, session_uuid=None, profile_name=None, local_path=None):
"""\
- Unshare local folder that is mounted in the X2go session registered as
+ Unshare local folder that is mounted in the X2Go session registered as
C{session_uuid}.
- When calling this method the given client-side mounted folder on the X2go
+ When calling this method the given client-side mounted folder on the X2Go
server (via sshfs) for session with ID <session_uuid> will get
unmounted.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param profile_name: alternatively, the profile name can be used to unshare
mounted folders
@@ -1663,10 +1663,10 @@ class X2goClient(object):
def get_shared_folders(self, session_uuid=None, profile_name=None):
"""\
- Get a list of local folders mounted within X2go session with session hash <session_uuid>
+ Get a list of local folders mounted within X2Go session with session hash <session_uuid>
from this client.
- @return: returns a C{list} of those local folder names that are mounted within X2go session <session_uuid>.
+ @return: returns a C{list} of those local folder names that are mounted within X2Go session <session_uuid>.
@rtype: C{list}
"""
@@ -1687,9 +1687,9 @@ class X2goClient(object):
def client_connected_sessions(self, return_objects=False, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of X2go sessions that this L{X2goClient} instance is connected to.
+ Retrieve a list of X2Go sessions that this L{X2goClient} instance is connected to.
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_profile_names: return as list of session profile names
@type return_profile_names: C{bool}
@@ -1715,9 +1715,9 @@ class X2goClient(object):
def client_associated_sessions(self, return_objects=False, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of X2go sessions associated to this L{X2goClient} instance.
+ Retrieve a list of X2Go sessions associated to this L{X2goClient} instance.
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_profile_names: return as list of session profile names
@type return_profile_names: C{bool}
@@ -1743,9 +1743,9 @@ class X2goClient(object):
def client_running_sessions(self, return_objects=False, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of running X2go sessions.
+ Retrieve a list of running X2Go sessions.
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_profile_names: return as list of session profile names
@type return_profile_names: C{bool}
@@ -1771,9 +1771,9 @@ class X2goClient(object):
def client_suspended_sessions(self, return_objects=False, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of suspended X2go sessions.
+ Retrieve a list of suspended X2Go sessions.
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_profile_names: return as list of session profile names
@type return_profile_names: C{bool}
@@ -1799,9 +1799,9 @@ class X2goClient(object):
def client_registered_sessions(self, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of registered X2go sessions.
+ Retrieve a list of registered X2Go sessions.
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_profile_names: return as list of session profile names
@type return_profile_names: C{bool}
@@ -1819,7 +1819,7 @@ class X2goClient(object):
@property
def client_control_sessions(self):
"""\
- Equals a list of all registered X2go control sessions.
+ Equals a list of all registered X2Go control sessions.
"""
return self.session_registry.control_sessions
@@ -1840,7 +1840,7 @@ class X2goClient(object):
def client_registered_session_of_name(self, session_name, return_object=False):
"""\
- Retrieve X2go session of a given session name.
+ Retrieve X2Go session of a given session name.
@param session_name: session name
@type session_name: C{str}
@@ -1864,11 +1864,11 @@ class X2goClient(object):
def client_registered_sessions_of_profile_name(self, profile_name, return_objects=False, return_session_names=False):
"""\
- Retrieve registered X2go sessions of profile name <profile_name>.
+ Retrieve registered X2Go sessions of profile name <profile_name>.
@param profile_name: profile name
@type profile_name: C{str}
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
@@ -1880,11 +1880,11 @@ class X2goClient(object):
def client_connected_sessions_of_profile_name(self, profile_name, return_objects=False, return_session_names=False):
"""\
- Retrieve connected X2go sessions of profile name <profile_name>.
+ Retrieve connected X2Go sessions of profile name <profile_name>.
@param profile_name: profile name
@type profile_name: C{str}
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
@@ -1896,11 +1896,11 @@ class X2goClient(object):
def client_associated_sessions_of_profile_name(self, profile_name, return_objects=False, return_session_names=False):
"""\
- Retrieve associated X2go sessions of profile name <profile_name>.
+ Retrieve associated X2Go sessions of profile name <profile_name>.
@param profile_name: profile name
@type profile_name: C{str}
- @param return_objects: return as list of X2go session objects
+ @param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
@@ -1912,16 +1912,16 @@ class X2goClient(object):
__client_associated_sessions_of_profile_name = client_associated_sessions_of_profile_name
###
- ### Provide access to the X2go server's sessions DB
+ ### Provide access to the X2Go server's sessions DB
###
def server_is_alive(self, session_uuid):
"""\
Test if server that corresponds to the terminal session C{session_uuid} is alive.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: C{True} if X2go server connection for L{X2goSession} instance with <session_uuid> is alive.
+ @return: C{True} if X2Go server connection for L{X2goSession} instance with <session_uuid> is alive.
@rtype: C{bool}
"""
@@ -1936,9 +1936,9 @@ class X2goClient(object):
def all_servers_are_alive(self):
"""\
- Test vitality of all connected X2go servers.
+ Test vitality of all connected X2Go servers.
- @return: C{True} if all connected X2go servers are alive.
+ @return: C{True} if all connected X2Go servers are alive.
@rtype: C{bool}
"""
@@ -1949,13 +1949,13 @@ class X2goClient(object):
def server_valid_x2gouser(self, session_uuid, username=None):
"""\
- Check if user is allowed to start an X2go session on a remote server.
+ Check if user is allowed to start an X2Go session on a remote server.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param username: user name to test validity for
@type username: C{str}
- @return: Is remote user allowed to start an X2go session?
+ @return: Is remote user allowed to start an X2Go session?
@rtype: C{str}
"""
@@ -1967,7 +1967,7 @@ class X2goClient(object):
Retrieve a list of session names of all server-side running sessions (including those not
instantiated by our L{X2goClient} instance).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: list of session names
@rtype: C{list}
@@ -1977,14 +1977,14 @@ class X2goClient(object):
session_list = self._X2goClient__list_sessions(session_uuid)
return [ key for key in session_list.keys() if session_list[key].status == 'R' ]
else:
- raise x2go_exceptions.X2goClientException('X2go session with UUID %s is not connected' % session_uuid)
+ raise x2go_exceptions.X2goClientException('X2Go session with UUID %s is not connected' % session_uuid)
__server_running_sessions = server_running_sessions
def server_has_running_sessions(self, session_uuid):
"""\
- Equals C{True} if the X2go server has any running sessions.
+ Equals C{True} if the X2Go server has any running sessions.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: C{True}, if there are running sessions
@rtype: C{bool}
@@ -1995,9 +1995,9 @@ class X2goClient(object):
def server_has_running_session_of_name(self, session_uuid, session_name):
"""\
- Equals C{True} if the X2go server has a running session of name <session_name>.
+ Equals C{True} if the X2Go server has a running session of name <session_name>.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param session_name: session name
@type session_name: C{str}
@@ -2010,7 +2010,7 @@ class X2goClient(object):
Retrieve a list of session names of all server-side suspended sessions (including those not
instantiated by our L{X2goClient} instance).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: list of session names
@rtype: C{list}
@@ -2020,14 +2020,14 @@ class X2goClient(object):
session_list = self._X2goClient__list_sessions(session_uuid)
return [ key for key in session_list.keys() if session_list[key].status == 'S' ]
else:
- raise x2go_exceptions.X2goClientException('X2go session with UUID %s is not connected' % session_uuid)
+ raise x2go_exceptions.X2goClientException('X2Go session with UUID %s is not connected' % session_uuid)
__server_suspended_sessions = server_suspended_sessions
def server_has_suspended_sessions(self, session_uuid):
"""\
- Equals C{True} if the X2go server has any suspended sessions.
+ Equals C{True} if the X2Go server has any suspended sessions.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
@@ -2035,9 +2035,9 @@ class X2goClient(object):
def server_has_suspended_session_of_name(self, session_uuid, session_name):
"""\
- Equals C{True} if the X2go server has a suspended session of name <session_name>.
+ Equals C{True} if the X2Go server has a suspended session of name <session_name>.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param session_name: session name
@type session_name: C{str}
@@ -2053,15 +2053,15 @@ class X2goClient(object):
def clean_sessions(self, session_uuid):
"""\
- Find running X2go sessions that have previously been started by the
- connected user on the remote X2go server and terminate them.
+ Find running X2Go sessions that have previously been started by the
+ connected user on the remote X2Go server and terminate them.
- Before calling this method you have to setup a pro forma remote X2go session
+ Before calling this method you have to setup a pro forma remote X2Go session
with L{X2goClient.register_session()} (even if you do not intend to open
- a real X2go session window on the remote server) and connect to this session (with
+ a real X2Go session window on the remote server) and connect to this session (with
L{X2goClient.connect_session()}.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
@@ -2077,30 +2077,30 @@ class X2goClient(object):
register_sessions=False,
raw=False):
"""\
- Use the X2go session registered under C{session_uuid} to
- retrieve a list of running or suspended X2go sessions from the
- connected X2go server (for the authenticated user).
+ Use the X2Go session registered under C{session_uuid} to
+ retrieve a list of running or suspended X2Go sessions from the
+ connected X2Go server (for the authenticated user).
- Before calling this method you have to setup a pro forma remote X2go session
+ Before calling this method you have to setup a pro forma remote X2Go session
with L{X2goClient.register_session()} (even if you do not intend to open
- a real X2go session window on the remote server) and connect to this session (with
+ a real X2Go session window on the remote server) and connect to this session (with
L{X2goClient.connect_session()}.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param profile_name: use profile name instead of <session_uuid>
@type profile_name: C{str}
@param profile_id: use profile id instead of <profile_name> or <session_uuid>
@type profile_id: C{str}
- @param no_cache: do not get the session list from cache, query the X2go server directly
+ @param no_cache: do not get the session list from cache, query the X2Go server directly
@type no_cache: C{bool}
- @param refresh_cache: query the X2go server directly and update the session list cache
+ @param refresh_cache: query the X2Go server directly and update the session list cache
with the new information
@type refresh_cache: C{bool}
- @param update_sessionregistry: query the X2go server directly and update the
+ @param update_sessionregistry: query the X2Go server directly and update the
session registry according to the obtained information
@type update_sessionregistry: C{bool}
- @param register_sessions: query the X2go server directly and register newly found X2go session
+ @param register_sessions: query the X2Go server directly and register newly found X2Go session
as L{X2goSession} instances associated to this L{X2goClient} instance
@type register_sessions: C{bool}
@param raw: output the session list in X2go's raw C{x2golistsessions} format
@@ -2155,22 +2155,22 @@ class X2goClient(object):
no_cache=False, refresh_cache=False,
raw=False):
"""\
- Use the X2go session registered under C{session_uuid} to
- retrieve a list of X2go desktop sessions that are available
+ Use the X2Go session registered under C{session_uuid} to
+ retrieve a list of X2Go desktop sessions that are available
for desktop sharing.
- Before calling this method you have to setup a pro forma remote X2go session
+ Before calling this method you have to setup a pro forma remote X2Go session
with L{X2goClient.register_session()} (even if you do not intend to open
- a real X2go session window on the remote server) and connect to this session (with
+ a real X2Go session window on the remote server) and connect to this session (with
L{X2goClient.connect_session()}.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param profile_name: use profile name instead of <session_uuid>
@type profile_name: C{str}
@param profile_id: use profile id instead of <profile_name> or <session_uuid>
@type profile_id: C{str}
- @param no_cache: do not get the session list from cache, query the X2go server directly
+ @param no_cache: do not get the session list from cache, query the X2Go server directly
@type no_cache: C{bool}
@param raw: output the session list in X2go's raw C{x2golistsessions} format
@type raw: C{bool}
@@ -2217,7 +2217,7 @@ class X2goClient(object):
Use this method for object retrieval if you want to modify the »sessions«
configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
- Python X2go based application.
+ Python X2Go based application.
return: returns the client's session profiles instance
rtype: C{X2goSessionProfiles*} instance
@@ -2243,7 +2243,7 @@ class X2goClient(object):
Use this method for object retrieval if you want to modify the »settings«
configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
- Python X2go based application.
+ Python X2Go based application.
return: returns the client's settings configuration node
rtype: C{bool}
@@ -2258,7 +2258,7 @@ class X2goClient(object):
Use this method for object retrieval if you want to modify the printing
configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
- Python X2go based application.
+ Python X2Go based application.
return: returns the client's printing configuration node
rtype: C{bool}
@@ -2276,7 +2276,7 @@ class X2goClient(object):
Returns a dictionary with session options and values that represent
the session profile for C{profile_id_or_name}.
- @param profile_id_or_name: name or id of an X2go session profile as found
+ @param profile_id_or_name: name or id of an X2Go session profile as found
in the sessions configuration file
@type profile_id_or_name: C{str}
@@ -2335,7 +2335,7 @@ class X2goClient(object):
def client_connected_profiles(self, return_profile_names=False):
"""\
- Retrieve a list of session profiles that are currently connected to an X2go server.
+ Retrieve a list of session profiles that are currently connected to an X2Go server.
@param return_profile_names: return as list of session profile names
@type return_profile_names: C{bool}
@@ -2354,7 +2354,7 @@ class X2goClient(object):
Disconnect all L{X2goSession} instances that relate to C{profile_name} by closing down their
Paramiko/SSH Transport thread.
- @param profile_name: the X2go session profile name
+ @param profile_name: the X2Go session profile name
@type profile_name: C{str}
@return: a return value
@rtype: C{bool}
@@ -2381,9 +2381,9 @@ class X2goClient(object):
"""\
Update the session registry stati by profile name.
- @param profile_name: the X2go session profile name
+ @param profile_name: the X2Go session profile name
@type profile_name: C{str}
- @param session_list: a manually passed on list of X2go sessions
+ @param session_list: a manually passed on list of X2Go sessions
@type session_list: C{X2goServerList*} instances
"""
@@ -2407,7 +2407,7 @@ class X2goClient(object):
Update the session registry status of a specific L{X2goSession} instance with
session identifier <session_uuid>.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
@@ -2430,7 +2430,7 @@ class X2goClient(object):
"""\
Update the session list cache by profile name.
- @param profile_name: the X2go session profile name
+ @param profile_name: the X2Go session profile name
@type profile_name: C{str}
@param cache_types: specify what cache type to update (available: C{sessions}, C{desktops})
@type cache_types: C{tuple} or C{list}
@@ -2457,7 +2457,7 @@ class X2goClient(object):
Update the session list cache of a specific L{X2goSession} instance with
session identifier <session_uuid>.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param cache_types: specify what cache type to update (available: C{sessions}, C{desktops})
@type cache_types: C{tuple} or C{list}
@@ -2506,10 +2506,10 @@ class X2goClient(object):
def register_available_server_sessions_by_profile_name(self, profile_name):
"""\
- Register available sessions that are found on the X2go server the profile
+ Register available sessions that are found on the X2Go server the profile
of name C{<profile_name>} is connected to.
- @param profile_name: the X2go session profile name
+ @param profile_name: the X2Go session profile name
@type profile_name: C{str}
"""
@@ -2526,10 +2526,10 @@ class X2goClient(object):
def register_available_server_sessions_by_session_uuid(self, session_uuid):
"""\
- Register available sessions that are found on the X2go server that the L{X2goSession} instance
+ Register available sessions that are found on the X2Go server that the L{X2goSession} instance
with session identifier <session_uuid> is connected to.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
@@ -2539,7 +2539,7 @@ class X2goClient(object):
def register_available_server_sessions_all_profiles(self):
"""\
- Register all available sessions found on an X2go server for each session profile.
+ Register all available sessions found on an X2Go server for each session profile.
"""
for profile_name in self.client_connected_profiles(return_profile_names=True):
diff --git a/x2go/defaults.py b/x2go/defaults.py
index bad42fc..8bd0e96 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -28,11 +28,11 @@ import os
import paramiko
import platform
-## X2go imports
+## X2Go imports
import utils
##
-## Common X2go defaults
+## Common X2Go defaults
##
X2GOCLIENT_OS = platform.system()
@@ -127,28 +127,28 @@ BACKENDS_SESSIONPROFILES = {
'HTTPSBROKER': 'X2goSessionProfilesHTTPSBROKER',
'WINREG': 'X2goSessionProfilesWINREG',
}
-"""Python X2go backends for storing session profiles."""
+"""Python X2Go backends for storing session profiles."""
BACKENDS_CLIENTSETTINGS = {
'FILE': 'X2goClientSettingsFILE',
'GCONF': 'X2goClientSettingsGCONF',
'HTTPSBROKER': 'X2goClientSettingsHTTPSBROKER',
'WINREG': 'X2goClientSettingsWINREG',
}
-"""Python X2go backends for storing client settings."""
+"""Python X2Go backends for storing client settings."""
BACKENDS_CLIENTPRINTING = {
'FILE': 'X2goClientPrintingFILE',
'GCONF': 'X2goClientPrintingGCONF',
'HTTPSBROKER': 'X2goClientPrintingHTTPSBROKER',
'WINREG': 'X2goClientPrintingWINREG',
}
-"""Python X2go backends for storing print settings."""
+"""Python X2Go backends for storing print settings."""
BACKEND_SESSIONPROFILES_DEFAULT = 'X2goSessionProfilesFILE'
BACKEND_CLIENTSETTINGS_DEFAULT = 'X2goClientSettingsFILE'
BACKEND_CLIENTPRINTING_DEFAULT = 'X2goClientPrintingFILE'
##
-## X2go Printing
+## X2Go Printing
##
X2GO_SETTINGS_FILENAME = 'settings'
@@ -292,7 +292,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
}
"""L{X2goSessionProfiles} default values to fill a new session profile with."""
##
-## X2go Proxy defaults
+## X2Go Proxy defaults
##
# here is a list of NX 3.x compression methods, this is the "%"-hashed list that
@@ -349,7 +349,7 @@ for meth in [ m for m in pack_methods_nx3_noqual if "%" in m ]:
pack_methods_nx3 += [ meth.replace('%','%s' % str(i)) for i in range(0,10) ]
pack_methods_nx3.sort()
##
-## X2go session defaults
+## X2Go session defaults
##
X2GO_DESKTOPSESSIONS={
@@ -363,13 +363,13 @@ X2GO_DESKTOPSESSIONS={
"""A dictionary with meta-commands for X2go's window manager sessions."""
##
-## X2go SFTP server defaults
+## X2Go SFTP server defaults
##
RSAKEY_STRENGTH = 1024
RSAHostKey = paramiko.RSAKey.generate(RSAKEY_STRENGTH)
"""\
-An RSA host key for this client session. Python X2go does not use the
+An RSA host key for this client session. Python X2Go does not use the
system's host key but generates its own host key for each running
application instance.
@@ -405,6 +405,6 @@ X2GO_MIMEBOX_EXTENSIONS_BLACKLIST = [
]
"""Black-listed MIME box file extenstions."""
-# X2go desktop sharing
+# X2Go desktop sharing
X2GO_SHARE_VIEWONLY=0
X2GO_SHARE_FULLACCESS=1
diff --git a/x2go/forward.py b/x2go/forward.py
index a9b5894..b5616fe 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -19,7 +19,7 @@
"""\
Python Gevent based port forwarding server (openssh -L option) for the
-proxying of graphical X2go elements.
+proxying of graphical X2Go elements.
"""
__NAME__ = "x2gofwtunnel-pylib"
@@ -32,7 +32,7 @@ import gevent
from gevent import select, socket
from gevent.server import StreamServer
-# Python X2go modules
+# Python X2Go modules
import log
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
import x2go_exceptions
@@ -50,7 +50,7 @@ class X2goFwServer(StreamServer):
"""\
@param listener: listen on TCP/IP socket C{(<IP>, <Port>)}
@type listener: C{tuple}
- @param remote_host: hostname or IP of remote host (in case of X2go mostly 127.0.0.1)
+ @param remote_host: hostname or IP of remote host (in case of X2Go mostly 127.0.0.1)
@type remote_host: C{str}
@param remote_port: port of remote host
@type remote_port: C{int}
@@ -222,7 +222,7 @@ def start_forward_tunnel(local_host='127.0.0.1', local_port=22022,
"""\
Setup up a Paramiko/SSH port forwarding tunnel (like openssh -L option).
- The tunnel is used to transport X2go graphics data through a proxy application like nxproxy.
+ The tunnel is used to transport X2Go graphics data through a proxy application like nxproxy.
@param local_host: local starting point of the forwarding tunnel
@type local_host: C{int}
@@ -232,7 +232,7 @@ def start_forward_tunnel(local_host='127.0.0.1', local_port=22022,
@type remote_host: C{str}
@param remote_port: ... on port C{<remote_port>}
@type remote_port: C{int}
- @param ssh_transport: the Paramiko/SSH transport (i.e. the X2go sessions Paramiko/SSH transport object)
+ @param ssh_transport: the Paramiko/SSH transport (i.e. the X2Go sessions Paramiko/SSH transport object)
@type ssh_transport: C{instance}
@param session_instance: the L{X2goSession} instance that initiates this tunnel
@type session_instance: C{instance}
diff --git a/x2go/gevent_subprocess.py b/x2go/gevent_subprocess.py
index a348873..3aeffe0 100644
--- a/x2go/gevent_subprocess.py
+++ b/x2go/gevent_subprocess.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -33,7 +33,7 @@
### </quote>
###
### Thus, I place myself as the copyright holder for code in this file
-### for cases in that it is used in context of the X2go project.
+### for cases in that it is used in context of the X2Go project.
###
diff --git a/x2go/guardian.py b/x2go/guardian.py
index 65a21d3..77feeff 100644
--- a/x2go/guardian.py
+++ b/x2go/guardian.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goSessionGuardian class - a guardian thread that controls X2go session threads
+X2goSessionGuardian class - a guardian thread that controls X2Go session threads
and their sub-threads (like reverse forwarding tunnels, Paramiko transport threads,
etc.).
@@ -30,7 +30,7 @@ import gevent
import threading
import copy
-# Python X2go modules
+# Python X2Go modules
from cleanup import x2go_cleanup
import x2go_exceptions
import log
@@ -43,7 +43,7 @@ def _sigterm_handle(s, f):
class X2goSessionGuardian(threading.Thread):
"""\
- L{X2goSessionGuardian} thread controls X2go session threads and their sub-threads (like
+ L{X2goSessionGuardian} thread controls X2Go session threads and their sub-threads (like
reverse forwarding tunnels, Paramiko transport threads, etc.). Its main function is
to tidy up once a session gets interrupted (SIGTERM, SIGINT).
@@ -66,8 +66,8 @@ class X2goSessionGuardian(threading.Thread):
@type auto_update_listdesktops_cache: C{bool}
@param auto_update_sessionregistry: if set to C{True} the session status will be updated in regular intervals
@type auto_update_sessionregistry: C{bool}
- @param auto_register_sessions: register new sessions automatically once they appear in the X2go session (e.g.
- instantiated by another client that is connected to the same X2go server under same user ID)
+ @param auto_register_sessions: register new sessions automatically once they appear in the X2Go session (e.g.
+ instantiated by another client that is connected to the same X2Go server under same user ID)
@type auto_register_sessions: C{bool}
@param refresh_interval: refresh cache and session registry every <refresh_interval> seconds
@type refresh_interval: C{int}
@@ -110,7 +110,7 @@ class X2goSessionGuardian(threading.Thread):
if seconds % self.refresh_interval == 0:
- self.logger('Entering X2go Guardian client management loop...', loglevel=log.loglevel_DEBUG)
+ self.logger('Entering X2Go Guardian client management loop...', loglevel=log.loglevel_DEBUG)
if self.auto_update_listsessions_cache:
@@ -125,7 +125,7 @@ class X2goSessionGuardian(threading.Thread):
if self.auto_register_sessions:
self.client_instance.register_available_server_sessions_all_profiles()
- self.logger('X2go session guardian thread waking up after %s seconds' % seconds, loglevel=log.loglevel_DEBUG)
+ self.logger('X2Go session guardian thread waking up after %s seconds' % seconds, loglevel=log.loglevel_DEBUG)
for session_uuid in self.client_instance.session_registry.keys():
session_summary = self.client_instance.get_session_summary(session_uuid)
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index f789de1..240785c 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -36,7 +36,7 @@ import types
import cStringIO
import copy
-# Python X2go modules
+# Python X2Go modules
from defaults import LOCAL_HOME as _current_home
import log
import utils
@@ -45,7 +45,7 @@ class X2goIniFile(object):
"""
Base class for processing the different ini files used by X2go
clients. Primarily used to standardize the content of the different
- X2go client ini file (settings, printing, sessions, xconfig).
+ X2Go client ini file (settings, printing, sessions, xconfig).
If entries are omitted in an ini file, they are filled with
default values (as hard coded in Python X2go), so the resulting objects
@@ -93,7 +93,7 @@ class X2goIniFile(object):
# we purposefully do not inherit the SafeConfigParser class
# here as we do not want to run into name conflicts between
- # X2go ini file options and method / property names in
+ # X2Go ini file options and method / property names in
# SafeConfigParser... This is a pre-cautious approach...
self.iniConfig = ConfigParser.SafeConfigParser()
self.iniConfig.optionxform = str
@@ -166,7 +166,7 @@ class X2goIniFile(object):
def _fill_defaults(self):
"""\
Fills a C{SafeConfigParser} object with the default ini file
- values as pre-defined in Python X2go or. This SafeConfigParser
+ values as pre-defined in Python X2Go or. This SafeConfigParser
object is held in RAM. No configuration file is affected by this
method.
diff --git a/x2go/log.py b/x2go/log.py
index 0fced4d..61da222 100644
--- a/x2go/log.py
+++ b/x2go/log.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -41,12 +41,12 @@ loglevel_DEFAULT = loglevel_ERROR | loglevel_WARN | loglevel_NOTICE
Default loglevel of X2goLogger objects is: NOTICE & WARN & ERROR
"""
-# Python X2go modules
+# Python X2Go modules
import utils
class X2goLogger(object):
"""\
- A simple logger class, that is used by all Python X2go classes.
+ A simple logger class, that is used by all Python X2Go classes.
"""
name = ''
diff --git a/x2go/mimebox.py b/x2go/mimebox.py
index 5bfdb75..bc9dfa3 100644
--- a/x2go/mimebox.py
+++ b/x2go/mimebox.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -36,7 +36,7 @@ import types
import threading
import gevent
-# Python X2go modules
+# Python X2Go modules
import defaults
import utils
import log
@@ -48,7 +48,7 @@ if defaults.X2GOCLIENT_OS != 'Windows':
class X2goMIMEboxQueue(threading.Thread):
"""\
- If the X2go MIME box is supported in a particaluar L{X2goSession} instance
+ If the X2Go MIME box is supported in a particaluar L{X2goSession} instance
this class provides a sub-thread for handling incoming files in the MIME box
directory. The actual handling of a dropped file is handled by the classes
L{X2goMIMEboxActionOPEN}, L{X2goMIMEboxActionOPENWITH} and L{X2goMIMEboxActionSAVEAS}.
@@ -68,7 +68,7 @@ class X2goMIMEboxQueue(threading.Thread):
@type profile_name: C{str}
@param mimebox_dir: local directory for incoming MIME box files
@type mimebox_dir: C{str}
- @param mimebox_action: name or instance of either of the possible X2go print action classes
+ @param mimebox_action: name or instance of either of the possible X2Go print action classes
@type mimebox_action: C{str} or instance
@param client_instance: the underlying L{X2goClient} instance
@type client_instance: C{instance}
@@ -128,7 +128,7 @@ class X2goMIMEboxQueue(threading.Thread):
def resume(self):
"""\
- Resume operation of the X2go MIME box queue and continue accepting new incoming
+ Resume operation of the X2Go MIME box queue and continue accepting new incoming
files.
"""
@@ -186,7 +186,7 @@ class X2goMIMEboxQueue(threading.Thread):
if self._incoming_mimebox_jobs:
for _job in self._incoming_mimebox_jobs:
- self.logger('processing incoming X2go MIME box job: %s' % _job, loglevel=log.loglevel_NOTICE)
+ self.logger('processing incoming X2Go MIME box job: %s' % _job, loglevel=log.loglevel_NOTICE)
_new_mimeboxjob_thread = X2goMIMEboxJob(target=x2go_mimeboxjob_handler,
kwargs={
'mimebox_file': _job,
@@ -209,10 +209,10 @@ def x2go_mimeboxjob_handler(mimebox_file=None,
mimebox_action=None,
parent_thread=None, logger=None, ):
"""\
- This function is called as a handler function for each incoming X2go MIME box file
+ This function is called as a handler function for each incoming X2Go MIME box file
represented by the class L{X2goMIMEboxJob}.
- @param mimebox_file: MIME box file name as placed in to the X2go MIME box spool directory
+ @param mimebox_file: MIME box file name as placed in to the X2Go MIME box spool directory
@type mimebox_file: C{str}
@param mimebox_action: an instance of either of the possible C{X2goMIMEboxActionXXX} classes
@type mimebox_action: C{X2goMIMEboxActionXXX} nstance
@@ -237,7 +237,7 @@ def x2go_mimeboxjob_handler(mimebox_file=None,
elif not _blacklisted and not _dotfile:
logger('file extension of MIME box file %s is prohibited by session profile configuration' % mimebox_file, loglevel=log.loglevel_NOTICE)
elif _dotfile:
- logger('placing files starting with a dot (.<file>) into the X2go MIME box is prohibited, ignoring the file ,,%s\'\'' % mimebox_file, loglevel=log.loglevel_WARN)
+ logger('placing files starting with a dot (.<file>) into the X2Go MIME box is prohibited, ignoring the file ,,%s\'\'' % mimebox_file, loglevel=log.loglevel_WARN)
else:
logger('file extension of MIME box file %s has been found in Python X2go\' hardcoded MIME box extenstions blacklist' % mimebox_file, loglevel=log.loglevel_WARN)
@@ -256,7 +256,7 @@ def x2go_mimeboxjob_handler(mimebox_file=None,
class X2goMIMEboxJob(threading.Thread):
"""\
- For each X2go MIME box job we create a sub-thread that let's
+ For each X2Go MIME box job we create a sub-thread that let's
the MIME box job be processed in the background.
As a handler for this class the function L{x2go_mimeboxjob_handler()}
@@ -265,7 +265,7 @@ class X2goMIMEboxJob(threading.Thread):
"""
def __init__(self, **kwargs):
"""\
- Construct the X2go MIME box job thread...
+ Construct the X2Go MIME box job thread...
All parameters (**kwargs) are passed through to the constructor
of C{threading.Thread()}.
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index 1b815f9..2e1d881 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -42,7 +42,7 @@ if _X2GOCLIENT_OS in ("Windows"):
else:
import gevent_subprocess as subprocess
-# Python X2go modules
+# Python X2Go modules
import log
import defaults
# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
@@ -60,7 +60,7 @@ class X2goMIMEboxAction(object):
def __init__(self, client_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
This is a meta class and has no functionality as such. It is used as parent
- class by »real« X2go MIME box actions.
+ class by »real« X2Go MIME box actions.
@param client_instance: the underlying L{X2goClient} instance
@type client_instance: C{instance}
@@ -87,7 +87,7 @@ class X2goMIMEboxAction(object):
@property
def name(self):
"""\
- Return the X2go MIME box action's name.
+ Return the X2Go MIME box action's name.
"""
return self.__name__
@@ -95,7 +95,7 @@ class X2goMIMEboxAction(object):
@property
def description(self):
"""\
- Return the X2go MIME box action's description text.
+ Return the X2Go MIME box action's description text.
"""
return self.__description__
@@ -104,9 +104,9 @@ class X2goMIMEboxAction(object):
"""\
Perform the defined MIME box action (doing nothing in L{X2goMIMEboxAction} parent class).
- @param mimebox_file: file name as placed in to the X2go MIME box directory
+ @param mimebox_file: file name as placed in to the X2Go MIME box directory
@type mimebox_file: C{str}
- @param mimebox_dir: location of the X2go sessions's MIME box directory
+ @param mimebox_dir: location of the X2Go sessions's MIME box directory
@type mimebox_dir: C{str}
"""
@@ -142,7 +142,7 @@ class X2goMIMEboxActionOPEN(X2goMIMEboxAction):
@param mimebox_file: file name as placed in to the MIME box directory
@type mimebox_file: C{str}
- @param mimebox_dir: location of the X2go session's MIME box directory
+ @param mimebox_dir: location of the X2Go session's MIME box directory
@type mimebox_dir: C{str}
"""
@@ -197,7 +197,7 @@ class X2goMIMEboxActionOPENWITH(X2goMIMEboxAction):
@param mimebox_file: file name as placed in to the MIME box directory
@type mimebox_file: C{str}
- @param mimebox_dir: location of the X2go session's MIME box directory
+ @param mimebox_dir: location of the X2Go session's MIME box directory
@type mimebox_dir: C{str}
"""
@@ -256,9 +256,9 @@ class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction):
@param mimebox_file: file name as placed in to the MIME box directory
@type mimebox_file: C{str}
- @param mimebox_dir: location of the X2go session's MIME box directory
+ @param mimebox_dir: location of the X2Go session's MIME box directory
@type mimebox_dir: C{str}
- @param mimebox_file: PDF file name as placed in to the X2go spool directory
+ @param mimebox_file: PDF file name as placed in to the X2Go spool directory
"""
self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, mimebox_file), loglevel=log.loglevel_NOTICE)
diff --git a/x2go/monkey_patch_paramiko.py b/x2go/monkey_patch_paramiko.py
index c9a460a..dd04388 100644
--- a/x2go/monkey_patch_paramiko.py
+++ b/x2go/monkey_patch_paramiko.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
diff --git a/x2go/printactions.py b/x2go/printactions.py
index 4f26499..c57b700 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -48,7 +48,7 @@ if _X2GOCLIENT_OS in ("Windows"):
else:
import gevent_subprocess as subprocess
-# Python X2go modules
+# Python X2Go modules
import log
import defaults
# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
@@ -66,7 +66,7 @@ class X2goPrintAction(object):
def __init__(self, client_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
This is a meta class and has no functionality as such. It is used as parent
- class by »real« X2go print actions.
+ class by »real« X2Go print actions.
@param client_instance: the underlying L{X2goClient} instance
@type client_instance: C{instance}
@@ -93,7 +93,7 @@ class X2goPrintAction(object):
@property
def name(self):
"""\
- Return the X2go print action's name.
+ Return the X2Go print action's name.
"""
return self.__name__
@@ -101,7 +101,7 @@ class X2goPrintAction(object):
@property
def description(self):
"""\
- Return the X2go print action's description text.
+ Return the X2Go print action's description text.
"""
return self.__description__
@@ -110,11 +110,11 @@ class X2goPrintAction(object):
"""\
Perform the defined print action (doing nothing in L{X2goPrintAction} parent class).
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param spool_dir: location of the X2go client's spool directory
+ @param spool_dir: location of the X2Go client's spool directory
@type spool_dir: C{str}
"""
@@ -122,9 +122,9 @@ class X2goPrintAction(object):
def _humanreadable_filename(self, pdf_file, job_title, target_path):
"""\
- Extract a human readable filename for the X2go print job file.
+ Extract a human readable filename for the X2Go print job file.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
@@ -175,13 +175,13 @@ class X2goPrintActionPDFVIEW(X2goPrintAction):
def do_print(self, pdf_file, job_title, spool_dir, ):
"""\
- Open an incoming X2go print job (PDF file) in an external PDF viewer application.
+ Open an incoming X2Go print job (PDF file) in an external PDF viewer application.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param spool_dir: location of the X2go client's spool directory
+ @param spool_dir: location of the X2Go client's spool directory
@type spool_dir: C{str}
"""
@@ -257,13 +257,13 @@ class X2goPrintActionPDFSAVE(X2goPrintAction):
def do_print(self, pdf_file, job_title, spool_dir):
"""\
- Save an incoming X2go print job (PDF file) to a local folder.
+ Save an incoming X2Go print job (PDF file) to a local folder.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param spool_dir: location of the X2go client's spool directory
+ @param spool_dir: location of the X2Go client's spool directory
@type spool_dir: C{str}
"""
@@ -298,13 +298,13 @@ class X2goPrintActionPRINT(X2goPrintAction):
def do_print(self, pdf_file, job_title, spool_dir, ):
"""\
- Actually really print an incoming X2go print job (PDF file) to a local printer device.
+ Actually really print an incoming X2Go print job (PDF file) to a local printer device.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param spool_dir: location of the X2go client's spool directory
+ @param spool_dir: location of the X2Go client's spool directory
@type spool_dir: C{str}
"""
@@ -429,11 +429,11 @@ class X2goPrintActionPRINTCMD(X2goPrintAction):
Execute an external command that has been defined on construction
of this L{X2goPrintActionPRINTCMD} instance.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param spool_dir: location of the X2go client's spool directory
+ @param spool_dir: location of the X2Go client's spool directory
@type spool_dir: C{str}
"""
@@ -485,11 +485,11 @@ class X2goPrintActionDIALOG(X2goPrintAction):
Execute an external command that has been defined on construction
of this L{X2goPrintActionPRINTCMD} instance.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param spool_dir: location of the X2go client's spool directory
+ @param spool_dir: location of the X2Go client's spool directory
@type spool_dir: C{str}
"""
diff --git a/x2go/printqueue.py b/x2go/printqueue.py
index 6f4e647..8eeaef6 100644
--- a/x2go/printqueue.py
+++ b/x2go/printqueue.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -20,7 +20,7 @@
"""\
L{X2goPrintQueue} sets up a thread that listens for incoming print jobs.
-For each incoming print job in an X2go session's spool directory an
+For each incoming print job in an X2Go session's spool directory an
individual thread is started (L{X2goPrintJob}) that handles the processing
of the incoming print job.
@@ -33,7 +33,7 @@ import copy
import threading
import gevent
-# Python X2go modules
+# Python X2Go modules
import defaults
import utils
import log
@@ -50,8 +50,8 @@ from defaults import X2GO_PRINTING_FILENAME as _X2GO_PRINTING_FILENAME
class X2goPrintQueue(threading.Thread):
"""\
- If X2go printing is supported in a particular L{X2goSession} instance
- this class provides a sub-thread for handling incoming X2go print jobs.
+ If X2Go printing is supported in a particular L{X2goSession} instance
+ this class provides a sub-thread for handling incoming X2Go print jobs.
"""
print_action = None
@@ -75,10 +75,10 @@ class X2goPrintQueue(threading.Thread):
@type profile_name: C{str}
@param spool_dir: local spool directory for incoming print job files
@type spool_dir: C{str}
- @param print_action: name or instance of either of the possible X2go print action classes
+ @param print_action: name or instance of either of the possible X2Go print action classes
@type print_action: C{str} or instance
@param print_action_args: depending of the chosen C{print_action} this dictionary may contain different
- values; the C{print_action_args} will be passed on to the X2go print action instance constructor, so
+ values; the C{print_action_args} will be passed on to the X2Go print action instance constructor, so
refer to either of these: L{X2goPrintActionPDFVIEW}, L{X2goPrintActionPRINT} et al.
@param client_instance: the underlying L{X2goClient} instance
@type client_instance: C{instance}
@@ -129,7 +129,7 @@ class X2goPrintQueue(threading.Thread):
def resume(self):
"""\
- Resume operation of the X2go print spooler and continue accepting new incoming
+ Resume operation of the X2Go print spooler and continue accepting new incoming
print jobs.
"""
@@ -160,7 +160,7 @@ class X2goPrintQueue(threading.Thread):
(pdf_filename, job_title) = content.split('\n')[0:2]
except ValueError:
pdf_filename = content
- job_title = 'X2go Print Job'
+ job_title = 'X2Go Print Job'
j.close()
jobs.append((_job_file, pdf_filename, job_title))
return [ j for j in jobs if j[1] not in self.active_jobs.keys() ]
@@ -200,7 +200,7 @@ class X2goPrintQueue(threading.Thread):
if self._incoming_print_jobs:
for _job in self._incoming_print_jobs:
- self.logger('processing incoming X2go print job: %s' % _job[1], loglevel=log.loglevel_NOTICE)
+ self.logger('processing incoming X2Go print job: %s' % _job[1], loglevel=log.loglevel_NOTICE)
_new_printjob_thread = X2goPrintJob(target=x2go_printjob_handler,
kwargs={
'job_file': _job[0],
@@ -221,14 +221,14 @@ class X2goPrintQueue(threading.Thread):
def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_action=None, parent_thread=None, logger=None, ):
"""\
- This function is called as a handler function for each incoming X2go print job
+ This function is called as a handler function for each incoming X2Go print job
represented by the class L{X2goPrintJob}.
The handler function will (re-)read the »printing« configuration file (if no
explicit C{print_action} is passed to this function...). It then will
execute the C{<print_action>.do_print()} command.
- @param pdf_file: PDF file name as placed in to the X2go spool directory
+ @param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
@@ -279,7 +279,7 @@ def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_ac
class X2goPrintJob(threading.Thread):
"""\
- For each X2go print job we create a sub-thread that let's
+ For each X2Go print job we create a sub-thread that let's
the print job be processed in the background.
As a handler for this class the function L{x2go_printjob_handler()}
@@ -288,7 +288,7 @@ class X2goPrintJob(threading.Thread):
"""
def __init__(self, **kwargs):
"""\
- Construct the X2go print job thread...
+ Construct the X2Go print job thread...
All parameters (**kwargs) are passed through to the constructor
of C{threading.Thread()}.
diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index 1498645..10ca1ef 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -41,7 +41,7 @@ import threading
import gevent
import copy
-# Python X2go modules
+# Python X2Go modules
import log
class X2goPulseAudio(threading.Thread):
diff --git a/x2go/registry.py b/x2go/registry.py
index 7df4dd1..35426f1 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -30,7 +30,7 @@ import uuid
import time
import threading
-# Python X2go modules
+# Python X2Go modules
import log
import utils
import session
@@ -103,7 +103,7 @@ class X2goSessionRegistry(object):
"""\
Returns the L{X2goSession} instance for a given session UUID hash.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: the corresponding L{X2goSession} instance
@rtype: L{X2goSession} instance
@@ -117,7 +117,7 @@ class X2goSessionRegistry(object):
def disable_session_auto_registration(self):
"""\
This method is used to temporarily skip auto-registration of newly appearing
- X2go session on the server side. This is necessary during session startups to
+ X2Go session on the server side. This is necessary during session startups to
assure that the session registry does not get filled with session UUID
duplicates.
@@ -127,7 +127,7 @@ class X2goSessionRegistry(object):
def enable_session_auto_registration(self):
"""\
This method is used to temporarily (re-)enable auto-registration of newly appearing
- X2go session on the server side.
+ X2Go session on the server side.
"""
self._skip_auto_registration = False
@@ -136,7 +136,7 @@ class X2goSessionRegistry(object):
"""\
Forget the complete record for session UUID C{session_uuid}.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
@@ -150,7 +150,7 @@ class X2goSessionRegistry(object):
"""\
Retrieve the profile ID of a given session UUID hash.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: profile ID
@rtype: C{str}
@@ -162,7 +162,7 @@ class X2goSessionRegistry(object):
"""\
Retrieve the profile name of a given session UUID hash.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: profile name
@rtype: C{str}
@@ -174,7 +174,7 @@ class X2goSessionRegistry(object):
"""\
Compose a session summary (as Python dictionary).
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: session summary dictionary
@rtype: C{dict}
@@ -222,7 +222,7 @@ class X2goSessionRegistry(object):
Update the session status for L{X2goSession} that is represented by a given session UUID hash,
profile name or profile ID.
- @param session_uuid: the X2go session's UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@param profile_name: alternatively, a profile name can be specified (the stati of all registered sessions for this session
profile will be updated)
@@ -311,9 +311,9 @@ class X2goSessionRegistry(object):
def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False):
"""\
- Register server-side available X2go sessions with this L{X2goSessionRegistry} instance for a given profile name.
+ Register server-side available X2Go sessions with this L{X2goSessionRegistry} instance for a given profile name.
- @param profile_name: session profile name to register available X2go sessions for
+ @param profile_name: session profile name to register available X2Go sessions for
@type profile_name: C{str}
@param session_list: an optional C{X2goServerSessionList*} instance (as returned by the L{X2goClient.list_sessions()} command can
be passed to this method.
@@ -400,7 +400,7 @@ class X2goSessionRegistry(object):
"""\
Register a new L{X2goSession} instance with this L{X2goSessionRegistry}.
- @param server: hostname of X2go server
+ @param server: hostname of X2Go server
@type server: C{str}
@param profile_id: profile ID
@type profile_id: C{str}
@@ -408,19 +408,19 @@ class X2goSessionRegistry(object):
@type profile_name: C{str}
@param session_name: session name (if available)
@type session_name: C{str}
- @param control_backend: X2go control session backend to use
+ @param control_backend: X2Go control session backend to use
@type control_backend: C{class}
- @param terminal_backend: X2go terminal session backend to use
+ @param terminal_backend: X2Go terminal session backend to use
@type terminal_backend: C{class}
- @param info_backend: X2go session info backend to use
+ @param info_backend: X2Go session info backend to use
@type info_backend: C{class}
- @param list_backend: X2go session list backend to use
+ @param list_backend: X2Go session list backend to use
@type list_backend: C{class}
- @param proxy_backend: X2go proxy backend to use
+ @param proxy_backend: X2Go proxy backend to use
@type proxy_backend: C{class}
- @param settings_backend: X2go client settings backend to use
+ @param settings_backend: X2Go client settings backend to use
@type settings_backend: C{class}
- @param printing_backend: X2go client printing backend to use
+ @param printing_backend: X2Go client printing backend to use
@type printing_backend: C{class}
@param client_rootdir: client base dir (default: ~/.x2goclient)
@type client_rootdir: C{str}
@@ -489,8 +489,8 @@ class X2goSessionRegistry(object):
logger=self.logger, **kwargs)
session_uuid = s._X2goSession__get_uuid()
- self.logger('registering X2go session %s...' % profile_name, log.loglevel_NOTICE)
- self.logger('registering X2go session with UUID %s' % session_uuid, log.loglevel_DEBUG)
+ self.logger('registering X2Go session %s...' % profile_name, log.loglevel_NOTICE)
+ self.logger('registering X2Go session with UUID %s' % session_uuid, log.loglevel_DEBUG)
self.registry[session_uuid] = s
if profile_id not in self.control_sessions.keys():
@@ -575,7 +575,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -594,7 +594,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -613,7 +613,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -633,7 +633,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -652,7 +652,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -671,7 +671,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -706,7 +706,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -725,7 +725,7 @@ class X2goSessionRegistry(object):
@type return_profile_names: C{bool}
@param return_profile_ids: return as list of profile IDs
@type return_profile_ids: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects, profile names/IDs or session names)
@rtype: C{list}
@@ -735,14 +735,14 @@ class X2goSessionRegistry(object):
def connected_sessions_of_profile_name(self, profile_name, return_objects=True, return_session_names=False):
"""\
- For a given session profile name retrieve a list of sessions that are currently connected to the profile's X2go server.
+ For a given session profile name retrieve a list of sessions that are currently connected to the profile's X2Go server.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
@param profile_name: session profile name
@type profile_name: C{str}
@param return_objects: return as list of L{X2goSession} instances
@type return_objects: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects or session names)
@rtype: C{list}
@@ -764,7 +764,7 @@ class X2goSessionRegistry(object):
@type profile_name: C{str}
@param return_objects: return as list of L{X2goSession} instances
@type return_objects: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects or session names)
@rtype: C{list}
@@ -786,7 +786,7 @@ class X2goSessionRegistry(object):
@type profile_name: C{str}
@param return_objects: return as list of L{X2goSession} instances
@type return_objects: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects or session names)
@rtype: C{list}
@@ -810,7 +810,7 @@ class X2goSessionRegistry(object):
@type profile_name: C{str}
@param return_objects: return as list of L{X2goSession} instances
@type return_objects: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects or session names)
@rtype: C{list}
@@ -832,7 +832,7 @@ class X2goSessionRegistry(object):
@type profile_name: C{str}
@param return_objects: return as list of L{X2goSession} instances
@type return_objects: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects or session names)
@rtype: C{list}
@@ -854,7 +854,7 @@ class X2goSessionRegistry(object):
@type profile_name: C{str}
@param return_objects: return as list of L{X2goSession} instances
@type return_objects: C{bool}
- @param return_session_names: return as list of X2go session names
+ @param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@return: a session list (as UUID hashes, objects or session names)
@rtype: C{list}
diff --git a/x2go/rforward.py b/x2go/rforward.py
index caeacb3..1fa81e4 100644
--- a/x2go/rforward.py
+++ b/x2go/rforward.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,8 +18,8 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2go reverse SSH/Paramiko tunneling provides X2go sound, X2go printing and
-X2go sshfs for folder sharing and mounting remote devices in X2go terminal
+X2Go reverse SSH/Paramiko tunneling provides X2Go sound, X2Go printing and
+X2Go sshfs for folder sharing and mounting remote devices in X2Go terminal
server sessions.
"""
@@ -35,13 +35,13 @@ import paramiko
from gevent import select, socket, Timeout
from gevent import sleep as gevent_sleep
-# Python X2go modules
+# Python X2Go modules
import log
def x2go_transport_tcp_handler(chan, (origin_addr, origin_port), (server_addr, server_port)):
"""\
- An X2go customized TCP handler for the Paramiko/SSH C{Transport()} class.
+ An X2Go customized TCP handler for the Paramiko/SSH C{Transport()} class.
Incoming channels will be put into Paramiko's default accept queue. This corresponds to
the default behaviour of Paramiko's C{Transport} class.
@@ -74,7 +74,7 @@ def x2go_transport_tcp_handler(chan, (origin_addr, origin_port), (server_addr, s
class X2goRevFwTunnel(threading.Thread):
"""\
L{X2goRevFwTunnel} class objects are used to reversely tunnel
- X2go audio, X2go printing and X2go folder sharing / device mounting
+ X2Go audio, X2Go printing and X2Go folder sharing / device mounting
through Paramiko/SSH.
"""
@@ -87,13 +87,13 @@ class X2goRevFwTunnel(threading.Thread):
notification (L{X2goRevFwTunnel.notify()} gets called from within the transport's
TCP handler function L{x2go_transport_tcp_handler} of the L{X2goSession} instance.
- @param server_port: the TCP/IP port on the X2go server (starting point of the tunnel),
+ @param server_port: the TCP/IP port on the X2Go server (starting point of the tunnel),
normally some number above 30000
@type server_port: int
- @param remote_host: the target address for reversely tunneled traffic. With X2go this should
+ @param remote_host: the target address for reversely tunneled traffic. With X2Go this should
always be set to the localhost (IPv4) address.
@type remote_host: str
- @param remote_port: the TCP/IP port on the X2go client (end point of the tunnel),
+ @param remote_port: the TCP/IP port on the X2Go client (end point of the tunnel),
normally an application's standard port (22 for SSH, 4713 for pulse audio, etc.)
@type remote_port: int
@param ssh_transport: the L{X2goSession}'s Paramiko/SSH transport instance
@@ -228,14 +228,14 @@ class X2goRevFwTunnel(threading.Thread):
L{X2goRevFwTunnel.run()} waits for notifications of an appropriate incoming
Paramiko/SSH channel (issued by L{X2goRevFwTunnel.notify()}). Appropriate in
- this context means, that its start point on the X2go server matches the class's
+ this context means, that its start point on the X2Go server matches the class's
property C{server_port}.
Once a new incoming channel gets announced by the L{notify()} method, a new
L{X2goRevFwChannelThread} instance will be initialized. As a data stream handler,
the function L{x2go_rev_forward_channel_handler()} will be used.
- The channel will last till the connection gets dropped on the X2go server side or
+ The channel will last till the connection gets dropped on the X2Go server side or
until the tunnel gets paused by an L{X2goRevFwTunnel.pause()} call or stopped via the
L{X2goRevFwTunnel.stop_thread()} method.
@@ -246,11 +246,11 @@ class X2goRevFwTunnel(threading.Thread):
self.incoming_channel.acquire()
- self.logger('waiting for incoming data channel on X2go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
+ self.logger('waiting for incoming data channel on X2Go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
self.incoming_channel.wait()
if self._keepalive:
- self.logger('detected incoming data channel on X2go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
+ self.logger('detected incoming data channel on X2Go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
_chan = self.ssh_transport.accept()
self.logger('data channel %s for server port [127.0.0.1]:%s is up' % (_chan, self.server_port), loglevel=log.loglevel_DEBUG)
else:
@@ -284,7 +284,7 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N
- ... if the L{X2goRevFwTunnel} parent thread gets paused. The call
of L{X2goRevFwTunnel.pause()} on the instance can be used to shut down all incoming
tunneled SSH connections associated to this L{X2goRevFwTunnel} instance
- from within a Python X2go application.
+ from within a Python X2Go application.
@param chan: channel
@type chan: C{class}
diff --git a/x2go/session.py b/x2go/session.py
index 1017b71..802d1cf 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goSession class - a public API of Python X2go, handling standalone X2go
+X2goSession class - a public API of Python X2go, handling standalone X2Go
sessions.
This class is normally embedded into the context of an L{X2goClient}
@@ -36,7 +36,7 @@ import time
import threading
import gevent
-# Python X2go modules
+# Python X2Go modules
import log
import utils
import session
@@ -73,20 +73,20 @@ _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack',
'control_backend', 'terminal_backend', 'proxy_backend',
'profiles_backend', 'settings_backend', 'printing_backend',
)
-"""A list of allowed X2go session parameters."""
+"""A list of allowed X2Go session parameters."""
_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password',
'sshproxy_key_filename', 'sshproxy_pkey', 'sshproxy_tunnel',
)
-"""A list of allowed X2go SSH proxy parameters."""
+"""A list of allowed X2Go SSH proxy parameters."""
class X2goSession(object):
"""\
- Public API class for launching X2go sessions. Recommended is to manage X2go sessions from
- within an L{X2goClient} instance. However, Python X2go is designed in a way that it also
+ Public API class for launching X2Go sessions. Recommended is to manage X2Go sessions from
+ within an L{X2goClient} instance. However, Python X2Go is designed in a way that it also
allows the management of singel L{X2goSession} instance.
- Thus, you can use the L{X2goSession} class to manually set up X2go sessions without
+ Thus, you can use the L{X2goSession} class to manually set up X2Go sessions without
L{X2goClient} context (session registry, session list cache, auto-registration of new
sessions etc.).
@@ -119,11 +119,11 @@ class X2goSession(object):
client_instance=None,
**params):
"""\
- @param server: hostname of X2go server
+ @param server: hostname of X2Go server
@type server: C{str}
@param control_session: an already initialized C{X2goControlSession*} instance
@type control_session: C{X2goControlSession*} instance
- @param use_sshproxy: for communication with X2go server use an SSH proxy host
+ @param use_sshproxy: for communication with X2Go server use an SSH proxy host
@type use_sshproxy: C{bool}
@param profile_id: profile ID
@type profile_id: C{str}
@@ -131,31 +131,31 @@ class X2goSession(object):
@type profile_name: C{str}
@param session_name: session name (if available)
@type session_name: C{str}
- @param printing: enable X2go printing
+ @param printing: enable X2Go printing
@type printing: C{bool}
- @param allow_mimebox: enable X2go MIME box support
+ @param allow_mimebox: enable X2Go MIME box support
@type allow_mimebox: C{bool}
- @param mimebox_extensions: whitelist of allowed X2go MIME box extensions
+ @param mimebox_extensions: whitelist of allowed X2Go MIME box extensions
@type mimebox_extensions: C{list}
- @param mimebox_action: action for incoming X2go MIME box files
+ @param mimebox_action: action for incoming X2Go MIME box files
@type mimebox_action: C{X2goMimeBoxAction*} or C{str}
@param allow_share_local_folders: enable local folder sharing support
@type allow_share_local_folders: C{bool}
- @param share_local_folders: list of local folders to share with the remote X2go session
+ @param share_local_folders: list of local folders to share with the remote X2Go session
@type share_local_folders: C{list}
- @param control_backend: X2go control session backend to use
+ @param control_backend: X2Go control session backend to use
@type control_backend: C{class}
- @param terminal_backend: X2go terminal session backend to use
+ @param terminal_backend: X2Go terminal session backend to use
@type terminal_backend: C{class}
- @param info_backend: X2go session info backend to use
+ @param info_backend: X2Go session info backend to use
@type info_backend: C{class}
- @param list_backend: X2go session list backend to use
+ @param list_backend: X2Go session list backend to use
@type list_backend: C{class}
- @param proxy_backend: X2go proxy backend to use
+ @param proxy_backend: X2Go proxy backend to use
@type proxy_backend: C{class}
- @param settings_backend: X2go client settings backend to use
+ @param settings_backend: X2Go client settings backend to use
@type settings_backend: C{class}
- @param printing_backend: X2go client printing backend to use
+ @param printing_backend: X2Go client printing backend to use
@type printing_backend: C{class}
@param client_rootdir: client base dir (default: ~/.x2goclient)
@type client_rootdir: C{str}
@@ -246,13 +246,13 @@ class X2goSession(object):
self.client_instance = client_instance
if self.logger.get_loglevel() & log.loglevel_DEBUG:
- self.logger('X2go control session parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)
+ self.logger('X2Go control session parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)
for p in self.control_params:
self.logger(' %s: %s' % (p, self.control_params[p]), log.loglevel_DEBUG)
- self.logger('X2go terminal session parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)
+ self.logger('X2Go terminal session parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)
for p in self.terminal_params:
self.logger(' %s: %s' % (p,self.terminal_params[p]), log.loglevel_DEBUG)
- self.logger('X2go sshproxy parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)
+ self.logger('X2Go sshproxy parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)
for p in self.sshproxy_params:
self.logger(' %s: %s' % (p,self.sshproxy_params[p]), loglevel=log.loglevel_DEBUG)
@@ -511,7 +511,7 @@ class X2goSession(object):
After a session has been set up you can query the
username the sessions runs as.
- @return: the remote username the X2go session runs as
+ @return: the remote username the X2Go session runs as
@rtype: C{str}
"""
@@ -524,11 +524,11 @@ class X2goSession(object):
def user_is_x2gouser(self, username=None):
"""\
- Check if a given user is valid server-side X2go user.
+ Check if a given user is valid server-side X2Go user.
@param username: username to check validity for
@type username: C{str}
- @return: return C{True} if the username is allowed to launch X2go sessions
+ @return: return C{True} if the username is allowed to launch X2Go sessions
@rtype: C{bool}
"""
@@ -555,7 +555,7 @@ class X2goSession(object):
peername of the host this session is connected to (or
about to connect to).
- @return: the address of the server the X2go session is
+ @return: the address of the server the X2Go session is
connected to (as an C{(addr,port)} tuple)
@rtype: C{tuple}
@@ -569,7 +569,7 @@ class X2goSession(object):
hostname of the host this session is connected to (or
about to connect to).
- @return: the hostname of the server the X2go session is
+ @return: the hostname of the server the X2Go session is
connected to / about to connect to
@rtype: C{str}
@@ -581,9 +581,9 @@ class X2goSession(object):
def get_server_port(self):
"""\
After a session has been setup up you can query the
- IP socket port used for connecting the remote X2go server.
+ IP socket port used for connecting the remote X2Go server.
- @return: the server-side IP socket port that is used by the X2go session to
+ @return: the server-side IP socket port that is used by the X2Go session to
connect to the server
@rtype: C{str}
@@ -593,9 +593,9 @@ class X2goSession(object):
def get_session_name(self):
"""\
- Retrieve the server-side X2go session name for this session.
+ Retrieve the server-side X2Go session name for this session.
- @return: X2go session name
+ @return: X2Go session name
@rtype: C{str}
"""
@@ -605,7 +605,7 @@ class X2goSession(object):
def get_session_cmd(self):
"""\
Retrieve the server-side command that is used to start a session
- on the remote X2go server.
+ on the remote X2Go server.
@return: server-side session command
@rtype: C{str}
@@ -680,9 +680,9 @@ class X2goSession(object):
"""\
Provide a host check mechanism. This method basically calls the L{HOOK_check_host_dialog()} method
which by itself calls the L{X2goClient.HOOK_check_host_dialog()} method. Make sure you
- override any of these to enable user interaction on X2go server validity checks.
+ override any of these to enable user interaction on X2Go server validity checks.
- @return: returns C{True} if an X2go server host is valid for authentication
+ @return: returns C{True} if an X2Go server host is valid for authentication
@rtype: C{bool}
"""
@@ -764,10 +764,10 @@ class X2goSession(object):
Connects to the L{X2goSession}'s server host. This method basically wraps around
the C{X2goControlSession*.connect()} method.
- @param username: the username for the X2go server that is going to be
+ @param username: the username for the X2Go server that is going to be
connected to (as a last minute way of changing the session username)
@type username: C{str}
- @param password: the user's password for the X2go server that is going to be
+ @param password: the user's password for the X2Go server that is going to be
connected to
@type password: C{str}
@param add_to_known_hosts: non-paramiko option, if C{True} paramiko.AutoAddPolicy()
@@ -777,14 +777,14 @@ class X2goSession(object):
@param force_password_auth: disable SSH pub/priv key authentication mechanisms
completely
@type force_password_auth: C{bool}
- @param use_sshproxy: use an SSH proxy host for connecting the target X2go server
+ @param use_sshproxy: use an SSH proxy host for connecting the target X2Go server
@type use_sshproxy: C{bool}
@param sshproxy_user: username for authentication against the SSH proxy host
@type sshproxy_user: C{str}
@param sshproxy_password: password for authentication against the SSH proxy host
@type sshproxy_password: C{str}
- @return: returns C{True} is the connection to the X2go server has been successful
+ @return: returns C{True} is the connection to the X2Go server has been successful
@rtype C{bool}
"""
@@ -887,7 +887,7 @@ class X2goSession(object):
def set_print_action(self, print_action, **kwargs):
"""\
- If X2go client-side printing is enable within this X2go session you can use
+ If X2Go client-side printing is enable within this X2Go session you can use
this method to alter the way how incoming print spool jobs are handled/processed.
For further information, please refer to the documentation of the L{X2goClient.set_session_print_action()}
@@ -908,7 +908,7 @@ class X2goSession(object):
def is_alive(self):
"""\
- Find out if this X2go session is still alive (that is: connected to the server).
+ Find out if this X2Go session is still alive (that is: connected to the server).
@return: returns C{True} if the server connection is still alive
@rtype: C{bool}
@@ -922,7 +922,7 @@ class X2goSession(object):
def clean_sessions(self, destroy_terminals=True):
"""\
- Clean all running sessions for the authenticated user on the remote X2go server.
+ Clean all running sessions for the authenticated user on the remote X2Go server.
"""
if self.is_alive():
@@ -933,7 +933,7 @@ class X2goSession(object):
def list_sessions(self, raw=False):
"""\
- List all sessions on the remote X2go server that are owned by the authenticated user
+ List all sessions on the remote X2Go server that are owned by the authenticated user
@param raw: if C{True} the output of this method equals
the output of the server-side C{x2golistsessions} command
@@ -952,7 +952,7 @@ class X2goSession(object):
def list_desktops(self, raw=False):
"""\
- List X2go desktops sessions available for desktop sharing on the remote X2go server.
+ List X2Go desktops sessions available for desktop sharing on the remote X2Go server.
@param raw: if C{True} the output of this method equals
the output of the server-side C{x2golistdesktops} command
@@ -978,7 +978,7 @@ class X2goSession(object):
"""\
Update the current session status. The L{X2goSession} instance uses an internal
session status cache that allows to query the session status without the need
- of retrieving data from the remote X2go server for each query.
+ of retrieving data from the remote X2Go server for each query.
The session status (if initialized properly with the L{X2goClient} constructor gets
updated in regularly intervals.
@@ -988,7 +988,7 @@ class X2goSession(object):
intervals to make sure the L{X2goSession}'s internal status cache information
is always up-to-date.
- @param session_list: provide an C{X2goServerSessionList*} that refers to X2go sessions we want to update.
+ @param session_list: provide an C{X2goServerSessionList*} that refers to X2Go sessions we want to update.
This option is mainly for reducing server/client traffic.
@type session_list: C{X2goServerSessionList*} instance
@param force_update: force a session status update, if if the last update is less then 1 second ago
@@ -1054,10 +1054,10 @@ class X2goSession(object):
def resume(self, session_name=None):
"""\
- Resume or continue a suspended / running X2go session on the
- remote X2go server.
+ Resume or continue a suspended / running X2Go session on the
+ remote X2Go server.
- @param session_name: the server-side name of an X2go session
+ @param session_name: the server-side name of an X2Go session
@type session_name: C{str}
@return: returns C{True} if resuming the session has been successful, C{False} otherwise
@@ -1153,7 +1153,7 @@ class X2goSession(object):
def start(self):
"""\
- Start a new X2go session on the remote X2go server.
+ Start a new X2Go session on the remote X2Go server.
@return: returns C{True} if starting the session has been successful, C{False} otherwise
@rtype: C{bool}
@@ -1165,7 +1165,7 @@ class X2goSession(object):
def share_desktop(self, desktop=None, user=None, display=None, share_mode=0, check_desktop_list=True):
"""\
- Share an already running X2go session on the remote X2go server locally. The shared session may be either
+ Share an already running X2Go session on the remote X2Go server locally. The shared session may be either
owned by the same user or by a user that grants access to his/her desktop session by the local user.
@param desktop: desktop ID of a sharable desktop in format <user>@<display>
@@ -1178,7 +1178,7 @@ class X2goSession(object):
@type display: C{str}
@param share_mode: desktop sharing mode, 0 is VIEW-ONLY, 1 is FULL-ACCESS.
@type share_mode: C{int}
- @param check_desktop_list: check if the given desktop is available on the X2go server; handle with care as
+ @param check_desktop_list: check if the given desktop is available on the X2Go server; handle with care as
the server-side C{x2golistdesktops} command might block client I/O.
@type check_desktop_list: C{bool}
@@ -1238,7 +1238,7 @@ class X2goSession(object):
def suspend(self):
"""\
- Suspend this X2go session.
+ Suspend this X2Go session.
@return: returns C{True} if suspending the session has been successful, C{False} otherwise
@rtype: C{bool}
@@ -1277,7 +1277,7 @@ class X2goSession(object):
def terminate(self):
"""\
- Terminate this X2go session.
+ Terminate this X2Go session.
@return: returns C{True} if terminating the session has been successful, C{False} otherwise
@rtype: C{bool}
@@ -1316,7 +1316,7 @@ class X2goSession(object):
"""\
Retrieve the profile name of this L{X2goSession} instance.
- @return: X2go client profile name of the session
+ @return: X2Go client profile name of the session
@rtype: C{str}
"""
@@ -1377,7 +1377,7 @@ class X2goSession(object):
def is_connected(self):
"""\
Test if the L{X2goSession}'s control session is connected to the
- remote X2go server.
+ remote X2Go server.
@return: C{True} if session is connected, C{False} otherwise
@rtype: C{bool}
@@ -1465,7 +1465,7 @@ class X2goSession(object):
def share_local_folder(self, local_path=None, folder_name=None):
"""\
- Share a local folder with this registered X2go session.
+ Share a local folder with this registered X2Go session.
@param local_path: the full path to an existing folder on the local
file system
@@ -1474,11 +1474,11 @@ class X2goSession(object):
@type folder_name: C{str}
@return: returns C{True} if the local folder has been successfully mounted within
- this X2go session
+ this X2Go session
@rtype: C{bool}
"""
- # compat for Python-X2go (<=0.1.1.6)
+ # compat for Python-X2Go (<=0.1.1.6)
if folder_name: local_path=folder_name
if self.has_terminal_session():
@@ -1495,14 +1495,14 @@ class X2goSession(object):
def unshare_all_local_folders(self, force_all=False):
"""\
- Unshare all local folders mounted within this X2go session.
+ Unshare all local folders mounted within this X2Go session.
@param force_all: Really unmount _all_ shared folders, including the print spool folder and
the MIME box spool dir (not recommended).
@type force_all: C{bool}
@return: returns C{True} if all local folders could be successfully unmounted
- inside this X2go session
+ inside this X2Go session
@rtype: C{bool}
"""
@@ -1526,14 +1526,14 @@ class X2goSession(object):
def unshare_local_folder(self, local_path=None):
"""\
- Unshare a local folder that is mounted within this X2go session.
+ Unshare a local folder that is mounted within this X2Go session.
@param local_path: the full path to an existing folder on the local
- file system that is mounted in this X2go session and shall be
+ file system that is mounted in this X2Go session and shall be
unmounted
@type local_path: C{str}
@return: returns C{True} if all local folders could be successfully unmounted
- inside this X2go session
+ inside this X2Go session
@rtype: C{bool}
"""
@@ -1549,9 +1549,9 @@ class X2goSession(object):
def get_shared_folders(self):
"""\
- Get a list of local folders mounted within this X2go session from this client.
+ Get a list of local folders mounted within this X2Go session from this client.
- @return: returns a C{list} of those folder names that are mounted with this X2go session.
+ @return: returns a C{list} of those folder names that are mounted with this X2Go session.
@rtype: C{list}
"""
@@ -1573,7 +1573,7 @@ class X2goSession(object):
def session_cleanup(self):
"""\
- Clean up X2go session.
+ Clean up X2Go session.
"""
# release terminal session's proxy
diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py
index f309ab2..e10e79b 100644
--- a/x2go/sftpserver.py
+++ b/x2go/sftpserver.py
@@ -2,15 +2,15 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# The Python X2go sFTPServer code was originally written by Richard Murri,
+# The Python X2Go sFTPServer code was originally written by Richard Murri,
# for further information see his website: http://www.richardmurri.com
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -21,11 +21,11 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-For sharing local folders via sFTP/sshfs Python X2go implements its own sFTP
+For sharing local folders via sFTP/sshfs Python X2Go implements its own sFTP
server (as end point of reverse forwarding tunnel requests). Thus, Python X2go
does not need a locally installed SSH daemon on the client side machine.
-The Python X2go sFTP server code was originally written by Richard Murri,
+The Python X2Go sFTP server code was originally written by Richard Murri,
for further information see his website: http://www.richardmurri.com
"""
@@ -38,7 +38,7 @@ import threading
import paramiko
import gevent
-# Python X2go modules
+# Python X2Go modules
import rforward
import defaults
import utils
@@ -469,8 +469,8 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface):
class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
"""\
A reverse fowarding tunnel with an sFTP server at its endpoint. This blend of a Paramiko/SSH
- reverse forwarding tunnel is used to provide access to local X2go client folders
- from within the the remote X2go server session.
+ reverse forwarding tunnel is used to provide access to local X2Go client folders
+ from within the the remote X2Go server session.
"""
def __init__(self, server_port, ssh_transport, auth_key=None, session_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
@@ -478,7 +478,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
Start a Paramiko/SSH reverse forwarding tunnel, that has an sFTP server listening at
the endpoint of the tunnel.
- @param server_port: the TCP/IP port on the X2go server (starting point of the tunnel),
+ @param server_port: the TCP/IP port on the X2Go server (starting point of the tunnel),
normally some number above 30000
@type server_port: int
@param ssh_transport: the L{X2goSession}'s Paramiko/SSH transport instance
@@ -522,14 +522,14 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
L{X2goRevFwTunnelToSFTP.run()} waits for notifications of an appropriate incoming
Paramiko/SSH channel (issued by L{X2goRevFwTunnelToSFTP.notify()}). Appropriate in
- this context means, that its starting point on the X2go server matches the class's
+ this context means, that its starting point on the X2Go server matches the class's
property C{server_port}.
Once a new incoming channel gets announced by the L{notify()} method, a new
L{X2goRevFwSFTPChannelThread} instance will be initialized. As a data stream handler,
the function L{x2go_rev_forward_sftpchannel_handler()} will be used.
- The channel will last till the connection gets dropped on the X2go server side or
+ The channel will last till the connection gets dropped on the X2Go server side or
until the tunnel gets paused by an L{X2goRevFwTunnelToSFTP.pause()} call or
stopped via the C{X2goRevFwTunnelToSFTP.stop_thread()} method.
@@ -540,10 +540,10 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
self.incoming_channel.acquire()
- self.logger('waiting for incoming sFTP channel on X2go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
+ self.logger('waiting for incoming sFTP channel on X2Go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
self.incoming_channel.wait()
if self._keepalive:
- self.logger('Detected incoming sFTP channel on X2go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
+ self.logger('Detected incoming sFTP channel on X2Go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG)
_chan = self.ssh_transport.accept()
self.logger('sFTP channel %s for server port [localhost]:%s is up' % (_chan, self.server_port), loglevel=log.loglevel_DEBUG)
else:
@@ -574,7 +574,7 @@ def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None):
- ... if the L{X2goRevFwTunnelToSFTP} parent thread gets paused. The call
of L{X2goRevFwTunnelToSFTP.pause()} on the instance can be used to shut down all incoming
tunneled SSH connections associated to this L{X2goRevFwTunnelToSFTP} instance
- from within a Python X2go application.
+ from within a Python X2Go application.
@param chan: an incoming sFTP channel
@type chan: paramiko.Channel instance
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index cc547b7..f37cb29 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -34,7 +34,7 @@ import socket
import string
import random
-# Python X2go modules
+# Python X2Go modules
import forward
import checkhosts
import log
@@ -50,7 +50,7 @@ monkey_patch_paramiko()
class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
"""\
- X2goSSHProxy can be used to proxy X2go connections through a firewall via SSH.
+ X2goSSHProxy can be used to proxy X2Go connections through a firewall via SSH.
"""
fw_tunnel = None
@@ -65,7 +65,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
session_instance=None,
logger=None, loglevel=log.loglevel_DEFAULT, ):
"""\
- Initialize an X2goSSHProxy instance. Use an instance of this class to tunnel X2go requests through
+ Initialize an X2goSSHProxy instance. Use an instance of this class to tunnel X2Go requests through
a proxying SSH server (i.e. to subLANs that are separated by firewalls or to private IP subLANs that
are NATted behind routers).
diff --git a/x2go/tests/__init__.py b/x2go/tests/__init__.py
index fa9a50b..7b5de7d 100644
--- a/x2go/tests/__init__.py
+++ b/x2go/tests/__init__.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -21,7 +21,7 @@ import os
import sys
base = os.path.join(os.path.split(os.path.split(os.getcwd())[0])[0])
-# prepend the X2go path (useful for building new packages)
+# prepend the X2Go path (useful for building new packages)
sys.path = [ os.path.normpath(base), ] + sys.path
import runalltests
diff --git a/x2go/tests/runalltests.py b/x2go/tests/runalltests.py
index 50697ae..c4373a8 100644
--- a/x2go/tests/runalltests.py
+++ b/x2go/tests/runalltests.py
@@ -3,12 +3,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -28,7 +28,7 @@ import sys
base = os.path.join(os.path.split(os.path.split(os.getcwd())[0])[0])
-# prepend the X2go path (useful for building new packages)
+# prepend the X2Go path (useful for building new packages)
sys.path = [os.path.normpath(base)] + sys.path
import unittest
diff --git a/x2go/tests/test_printing.py b/x2go/tests/test_printing.py
index bc7a4f2..efb13af 100644
--- a/x2go/tests/test_printing.py
+++ b/x2go/tests/test_printing.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -22,7 +22,7 @@ import unittest
import tempfile
import time
-# Python X2go modules
+# Python X2Go modules
import x2go
class TestX2goClientPrinting(unittest.TestCase):
diff --git a/x2go/utils.py b/x2go/utils.py
index 9bc4c6c..af15915 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-Python X2go helper functions, constants etc.
+Python X2Go helper functions, constants etc.
"""
__NAME__ = 'x2goutils-pylib'
@@ -37,7 +37,7 @@ import re
import subprocess
import Xlib
-# Python X2go modules
+# Python X2Go modules
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
from defaults import X_DISPLAY as _X_DISPLAY
from defaults import X2GO_SESSIONPROFILE_DEFAULTS as _X2GO_SESSIONPROFILE_DEFAULTS
@@ -58,7 +58,7 @@ def is_in_nx3packmethods(method):
def find_session_line_in_x2golistsessions(session_name, stdout):
"""\
- Return the X2go session meta information as returned by the
+ Return the X2Go session meta information as returned by the
C{x2golistsessions} server command for session C{session_name}.
"""
@@ -124,7 +124,7 @@ def _checkSessionProfileDefaults(defaults):
def _convert_SessionProfileOptions_2_SessionParams(_options):
"""\
Convert session profile options as used in x2goclient's sessions file to
- Python X2go session parameters.
+ Python X2Go session parameters.
"""
diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py
index 1cd86ca..3178f08 100644
--- a/x2go/x2go_exceptions.py
+++ b/x2go/x2go_exceptions.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-Python X2go exceptions.
+Python X2Go exceptions.
"""
__NAME__ = 'x2goexceptions-pylib'
@@ -29,7 +29,7 @@ import exceptions
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
-# Python X2go Exceptions
+# Python X2Go Exceptions
AuthenticationException = paramiko.AuthenticationException
"""inherited from Python Paramiko library"""
PasswordRequiredException = paramiko.AuthenticationException
diff --git a/x2go/xserver.py b/x2go/xserver.py
index b94771e..e3fe85b 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -2,12 +2,12 @@
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
-# Python X2go is free software; you can redistribute it and/or modify
+# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# Python X2go is distributed in the hope that it will be useful,
+# Python X2Go 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 Affero General Public License for more details.
@@ -36,7 +36,7 @@ import threading
import gevent
import copy
-# Python X2go modules
+# Python X2Go modules
import log
from defaults import X2GO_XCONFIG_CONFIGFILES as _X2GO_XCONFIG_CONFIGFILES
from defaults import X2GO_CLIENTXCONFIG_DEFAULTS as _X2GO_CLIENTXCONFIG_DEFAULTS
@@ -156,7 +156,7 @@ class X2goClientXConfig(inifiles.X2goIniFile):
"""\
Detect if an XServer launch is really needed (or if we use an already running XServer instance).
Equals C{True} if we have to launch an XServer before we can start/resume
- X2go sessions.
+ X2Go sessions.
"""
return not bool(self.running_xservers)
@@ -177,8 +177,8 @@ class X2goXServer(threading.Thread):
"""
This class is responsible for starting/stopping an external XServer application.
- X2go applications require a running XServer on the client system. This class will
- manage/handle the XServer while your X2go application is running.
+ X2Go applications require a running XServer on the client system. This class will
+ manage/handle the XServer while your X2Go application is running.
"""
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
31 Jan '12
The branch, master has been updated
via 10bb244d21b74faf4908f7b13ff25f54d73a78d3 (commit)
from 3c5a4dadf5a06803c25993e42d872fa10b9ad5b3 (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 10bb244d21b74faf4908f7b13ff25f54d73a78d3
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Jan 31 20:40:18 2012 +0100
Add default value for new session profile parameter xinerama (ignored by Python X2Go for now).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2go/defaults.py | 2 +-
x2go/utils.py | 1 +
3 files changed, 4 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8dcdfcc..4efe979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
Jakub Wilk. (THANKS!)
- The Python setuptools module does not have to be installed as dependency
with python-x2go.
+ - Add default value for new session profile parameter xinerama (ignored by
+ Python X2Go for now).
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/defaults.py b/x2go/defaults.py
index cc5bde9..bad42fc 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -280,7 +280,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
'useexports': True, 'fstunnel': True, 'export': '',
'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN',
'fullscreen': False,
- 'width': 800,'height': 600,'dpi': 96,'setdpi': False,
+ 'width': 800,'height': 600,'dpi': 96,'setdpi': False, 'xinerama': False,
'usekbd':True, 'layout': 'us', 'type': 'pc105/us',
'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png',
diff --git a/x2go/utils.py b/x2go/utils.py
index 58c7f9e..9bc4c6c 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -259,6 +259,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
'defsndport',
'icon',
'autostart',
+ 'xinerama',
]
for i in _ignored_options:
del _params[i]
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
31 Jan '12
The branch, master has been updated
via c6ecbeac0b53bea969d82c2cf8fe54ac28f762f8 (commit)
from 322a7f990adab973aa4dd39d5a07688e6020f977 (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 c6ecbeac0b53bea969d82c2cf8fe54ac28f762f8
Author: Moritz 'Morty' Strübe <morty(a)gmx.net>
Date: Tue Jan 31 09:39:29 2012 +0100
Add last change to changelog
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a218c6f..58ff0d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,12 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low
- Export KRB5CCNAME in x2goruncommand, make Kerberos ticket cache
known inside X2Go sessions.
+ [ Moritz Strübe ]
+ * New upstream version (3.0.99.10):
+ - Check whether the associated TCP/IP port is available before
+ assigning a display number.
+ * Add net-tools packaged as dependency.
+
[ John Williams ]
* New upstream version (3.0.99.10):
- Fix xserver-xsession/Makefile: add missing $(DESTDIR) expressions.
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
1
0
30 Jan '12
The branch, master has been updated
via 3c5a4dadf5a06803c25993e42d872fa10b9ad5b3 (commit)
from 15dea9c4820741515720d429b0bff4bd68df4dbd (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 3c5a4dadf5a06803c25993e42d872fa10b9ad5b3
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Mon Jan 30 22:46:08 2012 +0100
typo fix
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2d7d35c..8dcdfcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
an internal property.
- Fix many undefined symbols reported by Debian developer
Jakub Wilk. (THANKS!)
- - The Python setuptools modules does not have to be installed as dependency
+ - The Python setuptools module does not have to be installed as dependency
with python-x2go.
* Depend on python-xlib.
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
30 Jan '12
The branch, master has been updated
via 15dea9c4820741515720d429b0bff4bd68df4dbd (commit)
from a2e0625441c1653d71c27f9ed4f791c487338fd4 (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 15dea9c4820741515720d429b0bff4bd68df4dbd
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Mon Jan 30 22:44:27 2012 +0100
The Python setuptools modules does not have to be installed as dependency with python-x2go.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
setup.py | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 451a5ac..2d7d35c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
an internal property.
- Fix many undefined symbols reported by Debian developer
Jakub Wilk. (THANKS!)
+ - The Python setuptools modules does not have to be installed as dependency
+ with python-x2go.
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/setup.py b/setup.py
index 27a6587..2432978 100755
--- a/setup.py
+++ b/setup.py
@@ -30,5 +30,5 @@ setup(
url = 'http://www.x2go.org',
packages = find_packages('.'),
package_dir = {'': '.'},
- install_requires = ['setuptools', 'gevent', 'paramiko', ]
+ install_requires = ['gevent', 'paramiko', ]
)
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
30 Jan '12
The branch, master has been updated
via 322a7f990adab973aa4dd39d5a07688e6020f977 (commit)
from a591dd31b532c0fdc98cd051931ac4132ad7b40c (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 322a7f990adab973aa4dd39d5a07688e6020f977
Author: Moritz 'Morty' Strübe <morty(a)gmx.net>
Date: Fri Dec 9 18:52:34 2011 +0100
Make sure the socket used by nxagent is not already in use
-----------------------------------------------------------------------
Summary of changes:
debian/control | 3 ++-
x2goserver/bin/x2gostartagent | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/control b/debian/control
index ff07d92..0a51bcd 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,8 @@ Depends:
libdbd-sqlite3-perl,
adduser,
xauth,
- psmisc
+ psmisc,
+ net-tools
Recommends:
sshfs,
x11-apps,
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index e882fdd..a4952bc 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -120,8 +120,12 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME`
while [ "$OUTPUT" != "inserted" ]; do
X2GO_PORT=$(($X2GO_PORT + 1))
X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl`
-
- if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ]; then
+
+ #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too.
+ NX_PORT=$(($X2GO_PORT + 6000))
+ if [ -e "/tmp/.X${X2GO_PORT}-lock" ] ||
+ [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] ||
+ netstat -ntl 2>/dev/null | grep -q ":${NX_PORT} "; then
OUTPUT="XXX"
else
SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"`
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
1
0