x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.7-12-g4efe7f0
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, release/0.1.1.x has been updated via 4efe7f08c4ff3b7c09c997e365ca0f6c4e60d942 (commit) from 2eaa28d9aac14d7aa40f315084013bf2346665a5 (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 4efe7f08c4ff3b7c09c997e365ca0f6c4e60d942 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 12:54:37 2011 +0200 fix SSH proxy authentication ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 30 ++++++++++++++++++++++++++++- x2go/session.py | 57 +++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index 8f3a4f9..2af4230 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1043,10 +1043,38 @@ class X2goClient(object): return self.session_registry(session_uuid).check_host() __check_session_host = check_session_host + def session_uses_sshproxy(self, session_uuid): + """\ + Check if session with unique identifier <session_uuid> is configured to use an + intermediate SSH proxy server. + + @return: returns C{True} if the session is configured to use an SSH proxy, C{False} otherwise. + @rtype: C{bool} + + """ + return self.session_registry(session_uuid).uses_sshproxy() + __session_uses_sshproxy = session_uses_sshproxy + + def session_can_sshproxy_auto_connect(self, session_uuid): + """\ + 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 + @type session_uuid: C{str} + + @return: returns C{True} if the session's SSH proxy can auto-connect, C{False} otherwise, C{None} + if no control session has been set up yet. + @rtype: C{bool} + + """ + return self.session_registry(session_uuid).can_sshproxy_auto_connect() + __session_can_sshproxy_auto_connect = session_can_sshproxy_auto_connect + 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. 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 @type session_uuid: C{str} diff --git a/x2go/session.py b/x2go/session.py index f8d2ace..88d2a73 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -681,6 +681,37 @@ class X2goSession(object): return _valid or self.HOOK_check_host_dialog(host=_host, port=_port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) __check_host = check_host + def uses_sshproxy(self): + """\ + Check if a session is configured to use an intermediate SSH proxy server. + + @return: returns C{True} if the session is configured to use an SSH proxy, C{False} otherwise. + @rtype: C{bool} + + """ + return self.use_sshproxy + + def can_sshproxy_auto_connect(self): + """\ + Check if a session's SSH proxy (if used) is configured adequately to be able to auto-connect + to the SSH proxy server (e.g. by public key authentication). + + @return: returns C{True} if the session's SSH proxy can auto-connect, C{False} otherwise, C{None} + if no SSH proxy is used for this session, C{None} is returned. + @rtype: C{bool} + + """ + if self.use_sshproxy: + if self.sshproxy_params.has_key('sshproxy_key_filename') and self.sshproxy_params['sshproxy_key_filename'] and os.path.exists(os.path.normpath(self.sshproxy_params['sshproxy_key_filename'])): + return True + elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: + return True + else: + return False + else: + return None + __can_sshproxy_auto_connect = can_sshproxy_auto_connect + def can_auto_connect(self): """\ Check if a session is configured adequately to be able to auto-connect to the X2go @@ -691,26 +722,24 @@ class X2goSession(object): @rtype: C{bool} """ - - def _can_sshproxy_autoconnect(): - - if self.use_sshproxy: - if self.sshproxy_params.has_key('sshproxy_key_filename') and self.sshproxy_params['sshproxy_key_filename'] and os.path.exists(os.path.normpath(self.sshproxy_params['sshproxy_key_filename'])): - return True - elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: - return True - else: - return False - else: - return True + if self.control_session is None: + return None # do we have a key file passed as control parameter? if self.control_params.has_key('key_filename') and self.control_params['key_filename'] and os.path.exists(os.path.normpath(self.control_params['key_filename'])): - return _can_sshproxy_autoconnect() + _can_sshproxy_auto_connect = self.can_sshproxy_auto_connect() + if _can_sshproxy_auto_connect is not None: + return _can_sshproxy_auto_connect + else: + return True # or a private key? elif self.control_params.has_key('pkey') and self.control_params['pkey']: - return _can_sshproxy_autoconnect() + _can_sshproxy_auto_connect = self.can_sshproxy_auto_connect() + if _can_sshproxy_auto_connect is not None: + return _can_sshproxy_auto_connect + else: + return True else: return False 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

python-x2go.git - master (branch) updated: 0.1.1.4-62-g8966252
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 8966252f797a3dcf1bde347d6cfb7520e9900129 (commit) from 6126afedc1af9473b2b3581ac4f2c64663b9810e (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 8966252f797a3dcf1bde347d6cfb7520e9900129 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 12:54:37 2011 +0200 fix SSH proxy authentication ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 30 ++++++++++++++++++++++++++++- x2go/session.py | 57 +++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index e8b85b5..32b7386 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1043,10 +1043,38 @@ class X2goClient(object): return self.session_registry(session_uuid).check_host() __check_session_host = check_session_host + def session_uses_sshproxy(self, session_uuid): + """\ + Check if session with unique identifier <session_uuid> is configured to use an + intermediate SSH proxy server. + + @return: returns C{True} if the session is configured to use an SSH proxy, C{False} otherwise. + @rtype: C{bool} + + """ + return self.session_registry(session_uuid).uses_sshproxy() + __session_uses_sshproxy = session_uses_sshproxy + + def session_can_sshproxy_auto_connect(self, session_uuid): + """\ + 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 + @type session_uuid: C{str} + + @return: returns C{True} if the session's SSH proxy can auto-connect, C{False} otherwise, C{None} + if no control session has been set up yet. + @rtype: C{bool} + + """ + return self.session_registry(session_uuid).can_sshproxy_auto_connect() + __session_can_sshproxy_auto_connect = session_can_sshproxy_auto_connect + 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. 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 @type session_uuid: C{str} diff --git a/x2go/session.py b/x2go/session.py index 63cdd64..faf2598 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -681,6 +681,37 @@ class X2goSession(object): return _valid or self.HOOK_check_host_dialog(host=_host, port=_port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) __check_host = check_host + def uses_sshproxy(self): + """\ + Check if a session is configured to use an intermediate SSH proxy server. + + @return: returns C{True} if the session is configured to use an SSH proxy, C{False} otherwise. + @rtype: C{bool} + + """ + return self.use_sshproxy + + def can_sshproxy_auto_connect(self): + """\ + Check if a session's SSH proxy (if used) is configured adequately to be able to auto-connect + to the SSH proxy server (e.g. by public key authentication). + + @return: returns C{True} if the session's SSH proxy can auto-connect, C{False} otherwise, C{None} + if no SSH proxy is used for this session, C{None} is returned. + @rtype: C{bool} + + """ + if self.use_sshproxy: + if self.sshproxy_params.has_key('sshproxy_key_filename') and self.sshproxy_params['sshproxy_key_filename'] and os.path.exists(os.path.normpath(self.sshproxy_params['sshproxy_key_filename'])): + return True + elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: + return True + else: + return False + else: + return None + __can_sshproxy_auto_connect = can_sshproxy_auto_connect + def can_auto_connect(self): """\ Check if a session is configured adequately to be able to auto-connect to the X2go @@ -691,26 +722,24 @@ class X2goSession(object): @rtype: C{bool} """ - - def _can_sshproxy_autoconnect(): - - if self.use_sshproxy: - if self.sshproxy_params.has_key('sshproxy_key_filename') and self.sshproxy_params['sshproxy_key_filename'] and os.path.exists(os.path.normpath(self.sshproxy_params['sshproxy_key_filename'])): - return True - elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: - return True - else: - return False - else: - return True + if self.control_session is None: + return None # do we have a key file passed as control parameter? if self.control_params.has_key('key_filename') and self.control_params['key_filename'] and os.path.exists(os.path.normpath(self.control_params['key_filename'])): - return _can_sshproxy_autoconnect() + _can_sshproxy_auto_connect = self.can_sshproxy_auto_connect() + if _can_sshproxy_auto_connect is not None: + return _can_sshproxy_auto_connect + else: + return True # or a private key? elif self.control_params.has_key('pkey') and self.control_params['pkey']: - return _can_sshproxy_autoconnect() + _can_sshproxy_auto_connect = self.can_sshproxy_auto_connect() + if _can_sshproxy_auto_connect is not None: + return _can_sshproxy_auto_connect + else: + return True else: return False 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

pyhoca-gui.git - master (branch) updated: 0.1.0.6-52-gd4bc7cf
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via d4bc7cf1ae224fc6c4f4bb5a16de7f1d2720e86a (commit) from d0d2f476488f5800d77366af81c5fb3ed7e053c0 (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 d4bc7cf1ae224fc6c4f4bb5a16de7f1d2720e86a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 12:54:06 2011 +0200 fix SSH proxy authentication ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index af8e1cf..99d727a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -372,7 +372,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): except ValueError: pass else: - _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, ) + _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=not self._X2goClient__session_can_sshproxy_auto_connect(session_uuid)) self._logon_windows[profile_name] = _logon_window except x2go.AuthenticationException: self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, ) 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

pyhoca-gui.git - master (branch) updated: 0.1.0.6-51-gd0d2f47
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via d0d2f476488f5800d77366af81c5fb3ed7e053c0 (commit) from 64fcf06971940b3a47d7ecbf9f2ad0ded2f1d688 (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 d0d2f476488f5800d77366af81c5fb3ed7e053c0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 10:07:07 2011 +0200 whitespace fix ----------------------------------------------------------------------- Summary of changes: README.i18n | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/README.i18n b/README.i18n index bc45308..0d6dd54 100644 --- a/README.i18n +++ b/README.i18n @@ -39,6 +39,7 @@ Next thing to do is to obtained the latest sources from X2go Git. In your current working directory there should now be a subfolder named ,,pyhoca-gui''. + Editing Your Language File -------------------------- The recommended tool for editing gettext translation files is ,,poedit'' 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

pyhoca-gui.git - master (branch) updated: 0.1.0.6-50-g64fcf06
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 64fcf06971940b3a47d7ecbf9f2ad0ded2f1d688 (commit) from 19c27c596728fd5484d7a9f3c37e0506fb1039b5 (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 64fcf06971940b3a47d7ecbf9f2ad0ded2f1d688 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 10:06:07 2011 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: README.i18n | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/README.i18n b/README.i18n index 56dfce2..bc45308 100644 --- a/README.i18n +++ b/README.i18n @@ -22,7 +22,7 @@ Once you are subscribed, send an email to x2go-i18n(a)lists.berlios.de -that explains or willingness to translate this-and-that language. +that explains your willingness to translate this-and-that language. The developers will then provide a language file for you in the above mentioned /po folder. 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

pyhoca-gui.git - master (branch) updated: 0.1.0.6-49-g19c27c5
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 19c27c596728fd5484d7a9f3c37e0506fb1039b5 (commit) via c5d7079015c82b8e3bcd20d81c0c12683b7f37ff (commit) from d3d4cb09361adb59a30be1f13a09272090bfd631 (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 19c27c596728fd5484d7a9f3c37e0506fb1039b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 09:54:04 2011 +0200 Update of README.i18n. commit c5d7079015c82b8e3bcd20d81c0c12683b7f37ff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 16:09:06 2011 +0200 Dutch i18n update. ----------------------------------------------------------------------- Summary of changes: README.i18n | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++--- debian/changelog | 2 + po/nl.po | 18 +++++----- 3 files changed, 111 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/README.i18n b/README.i18n index 3fd3005..56dfce2 100644 --- a/README.i18n +++ b/README.i18n @@ -1,11 +1,105 @@ -Activating i18n for development... ----------------------------------- +Translating PyHoca-GUI +====================== -If you test/use PyHoca-GUI from VCS (and not as a distribution package) -then you have to activate i18n support with this command in PyHoca-GUI's -base directory: +Translating with gettext +------------------------ -$ python setup.py build_i18n +PyHoca-GUI uses gettext as translation service/mechanism (.po/.mo/.pot files). +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. + +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: + + http://lists.berlios.de/mailman/listinfo/x2go-i18n + +Once you are subscribed, send an email to + + x2go-i18n(a)lists.berlios.de + +that explains or willingness to translate this-and-that language. + +The developers will then provide a language file for you in the above mentioned /po +folder. + + +Git cloning +----------- +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 + $ # then checkout the code + $ git clone git://code.x2go.org/pyhoca-gui.git + +In your current working directory there should now be a subfolder named ,,pyhoca-gui''. + +Editing Your Language File +-------------------------- +The recommended tool for editing gettext translation files is ,,poedit'' + + $ aptitude install poedit + +Run poedit and configure it first (mostly personalizing, full name, email address, etc.). + +Now open your language file in <current_dir>/pyhoca-gui/po/<lang>.po and edit it with +poedit. + +NOTE: Make sure you translate all boldly marked items: non-translated as well as fuzzy +(i.e. inaccurate) items. + + +Testing i18n for development... +------------------------------- + +First, install pyhoca-gui with all its dependency from our package repository +on your workplace/development machine. + +For testing your translations of PyHoca-GUI you have to build the i18n files +with this command in PyHoca-GUI's base directory: + + $ cd <current_dir>/pyhoca-gui + $ python setup.py build_i18n + +If you system already runs with the locale (language setting) that you are +translating for then you simply have to start pyhoca-gui from the source base +folder: + + $ cd <current_dir>/pyhoca-gui + $ ./pyhoca-gui + +Otherwise export the locale you translate for before you execute pyhoca-gui (e.g. +for testing the German translation): + + $ export LANG=de_DE.UTF-8 pyhoca-gui + + +Sending in the Translation File +------------------------------- +When done, please send the complete translation file + + <current_dir>/pyhoca-gui/po/<lang>.po + +to x2go-i18n(a)lists.berlios.de and remove your working copy of pyhoca-gui from +your system (or read how to use Git and keep the folder). + +Next time... +------------ +You will get informed on x2go-i18n if a translation update is necessary. So check +your mails there regularly. + +For updating a translation, either keep the pyhoca-gui source project folder and +read more on Git by your self. + +Alternatively, just remove the folder (once you have sent in the translation file) +and start with this documentation all over again. + +THANKS AGAIN FOR YOUR TIME!!! light+love, Mike Gabriel \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 61cbcf6..2241611 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low - Add error message in case logon fails due to a missing home directory on the remote X2go server. - Spanish i18n update. + - Dutch i18n update. + - Update of README.i18n. * Depend on python-x2go (>=0.1.1.8). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/po/nl.po b/po/nl.po index 9c30829..46a2ecd 100644 --- a/po/nl.po +++ b/po/nl.po @@ -114,11 +114,11 @@ msgstr "" #: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - missing home directory" -msgstr "" +msgstr "%s - home directory niet aanwezig" #: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 msgid "The remote user's home directory does not exist." -msgstr "" +msgstr "De home directory op afstand van de gebruiker bestaat niet" #: ../pyhoca/wxgui/logon.py:363 #, python-format @@ -450,7 +450,7 @@ msgstr "Toevoegen" #: ../pyhoca/wxgui/profilemanager.py:251 msgid "Local Path" -msgstr "" +msgstr "Lokaal Pad" #: ../pyhoca/wxgui/profilemanager.py:252 #, fuzzy @@ -500,11 +500,11 @@ msgstr "Reset" #: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 #: ../pyhoca/wxgui/profilemanager.py:1409 msgid "automatically" -msgstr "" +msgstr "automatisch" #: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 msgid "manually" -msgstr "" +msgstr "handmatig" #: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" @@ -631,7 +631,7 @@ msgstr "Opties" #: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" -msgstr "&Beëindigen" +msgstr "&Beeindigen" #: ../pyhoca/wxgui/menus_taskbar.py:159 msgid "Resume Session" @@ -669,7 +669,7 @@ msgstr "Delen" #: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" -msgstr "" +msgstr "Niet meer delen" #: ../pyhoca/wxgui/menus_taskbar.py:250 #, fuzzy @@ -1129,7 +1129,7 @@ msgstr "Afdrukken" #: ../pyhoca/wxgui/printingprefs.py:227 msgid "- print system is not available -" -msgstr "" +msgstr "- print systeem niet beschikbaar" #: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" @@ -1159,4 +1159,4 @@ msgstr "Kies locatie om PDF op te slaan" #~ msgstr "Profile icon" #~ msgid "Arts" -#~ msgstr "Arts" +#~ msgstr "Arts" \ No newline at end of file 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

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-32-g0d4198a
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 0d4198a2a0e28e1984995ad8b60c132303d61c61 (commit) from 65513d1ac3a1d04eb168d14745edd49e2927f737 (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 0d4198a2a0e28e1984995ad8b60c132303d61c61 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 09:08:30 2011 +0200 fix change-log-line-too-long ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 38b315a..d9073a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,13 +12,13 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low - Add script x2godesktopsharing-terminate: detect x2godesktopsharing process of a given session and terminate that process. - Save settings and tidy up lock and socket file on X-Server crash. - - Provide feature for suspending/resume x2godesktopsharing (x2godesktopsharing - will be terminate on x2gosuspend-session and operations will be resumed on - x2goresume-session). + - Provide feature for suspending/resume x2godesktopsharing + (x2godesktopsharing will be terminate on x2gosuspend-session and + operations will be resumed on x2goresume-session). - Rename desktopsharing scripts: from x2godesktopsharing-<action> to x2go<action>-desktopsharing. - - Add man pages for x2go<action>-desktopsharing commands, re-arrange man page - folders in source project. + - Add man pages for x2go<action>-desktopsharing commands, re-arrange man + page folders in source project. * Depend on x2goserver (>=3.0.99.6). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-31-g65513d1
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 65513d1ac3a1d04eb168d14745edd49e2927f737 (commit) from d7dfa95bf6f99174a9a88adae3b3de68b57aa7d8 (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 65513d1ac3a1d04eb168d14745edd49e2927f737 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 09:06:57 2011 +0200 fix DISPLAY setting for x2godesktopsharing resuming ----------------------------------------------------------------------- Summary of changes: bin/x2goresume-desktopsharing | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/x2goresume-desktopsharing b/bin/x2goresume-desktopsharing index 34da2b5..aaa2c25 100755 --- a/bin/x2goresume-desktopsharing +++ b/bin/x2goresume-desktopsharing @@ -35,5 +35,5 @@ X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) test -e $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing && { rm -f $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing - export DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null & + DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null & } hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-30-gd7dfa95
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via d7dfa95bf6f99174a9a88adae3b3de68b57aa7d8 (commit) via a9be575d798f9cf7674f232becd9abddc63ec0ab (commit) via 090e7aff4281c5fa3bbc441962bbdc6056cb73c8 (commit) from dc2af16a85f83b4b1ebe9ce9079d6f00c8ab5c3e (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 d7dfa95bf6f99174a9a88adae3b3de68b57aa7d8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 08:51:20 2011 +0200 Add man pages for x2go<action>-desktopsharing commands, re-arrange man page folders in source project. commit a9be575d798f9cf7674f232becd9abddc63ec0ab Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 08:49:14 2011 +0200 fork to background commit 090e7aff4281c5fa3bbc441962bbdc6056cb73c8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 08:33:54 2011 +0200 man page update ----------------------------------------------------------------------- Summary of changes: bin/x2goresume-desktopsharing | 2 +- debian/changelog | 2 + debian/x2godesktopsharing.manpages | 3 +- man/{ => man1}/x2godesktopsharing.1 | 4 +- man/man8/x2goresume-desktopsharing.8 | 28 +++++++++++++++++++++++ man/man8/x2gosuspend-desktopsharing.8 | 37 +++++++++++++++++++++++++++++++ man/man8/x2goterminate-desktopsharing.8 | 30 +++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 4 deletions(-) rename man/{ => man1}/x2godesktopsharing.1 (86%) create mode 100644 man/man8/x2goresume-desktopsharing.8 create mode 100644 man/man8/x2gosuspend-desktopsharing.8 create mode 100644 man/man8/x2goterminate-desktopsharing.8 The diff of changes is: diff --git a/bin/x2goresume-desktopsharing b/bin/x2goresume-desktopsharing index c4ca03a..34da2b5 100755 --- a/bin/x2goresume-desktopsharing +++ b/bin/x2goresume-desktopsharing @@ -35,5 +35,5 @@ X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) test -e $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing && { rm -f $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing - export DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null + export DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null & } diff --git a/debian/changelog b/debian/changelog index c1aa47b..38b315a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low x2goresume-session). - Rename desktopsharing scripts: from x2godesktopsharing-<action> to x2go<action>-desktopsharing. + - Add man pages for x2go<action>-desktopsharing commands, re-arrange man page + folders in source project. * Depend on x2goserver (>=3.0.99.6). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 diff --git a/debian/x2godesktopsharing.manpages b/debian/x2godesktopsharing.manpages index 7aee1a9..ad46900 100644 --- a/debian/x2godesktopsharing.manpages +++ b/debian/x2godesktopsharing.manpages @@ -1 +1,2 @@ -man/x2godesktopsharing.1 \ No newline at end of file +man/man1/x2godesktopsharing.1 +man/man8/x2go*-desktopsharing.8 diff --git a/man/x2godesktopsharing.1 b/man/man1/x2godesktopsharing.1 similarity index 86% rename from man/x2godesktopsharing.1 rename to man/man1/x2godesktopsharing.1 index 2fba34c..07736a1 100644 --- a/man/x2godesktopsharing.1 +++ b/man/man1/x2godesktopsharing.1 @@ -15,8 +15,8 @@ x2godesktopsharing \- Share an X2go desktop with other clients and users. \fBx2godesktopsharing\fR .SH DESCRIPTION -\fBx2godesktopsharing\fR is a system tray tool that allows a user to control access his/her X2go -session (via shadow sessions). +\fBx2godesktopsharing\fR is a system tray tool that allows a user to give/control access to his/her X/X2go +session (via shadow session support in NX libraries). .PP .SH OPTIONS \fBx2godesktopsharing\fR has no known options. diff --git a/man/man8/x2goresume-desktopsharing.8 b/man/man8/x2goresume-desktopsharing.8 new file mode 100644 index 0000000..dc6fd28 --- /dev/null +++ b/man/man8/x2goresume-desktopsharing.8 @@ -0,0 +1,28 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goresume-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goresume-desktopsharing \- Resume Desktop Sharing Applet for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2goresume-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2goresume-desktopsharing\fR launches the \fBx2godesktopsharing\fR applet for X2go session <session_id>. +.PP +\fBx2goresume-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goresume-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2goresume-session(8), x2gosuspend-desktopsharing(8), x2goterminate-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2gosuspend-desktopsharing.8 b/man/man8/x2gosuspend-desktopsharing.8 new file mode 100644 index 0000000..6f7b6b4 --- /dev/null +++ b/man/man8/x2gosuspend-desktopsharing.8 @@ -0,0 +1,37 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosuspend-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2gosuspend-desktopsharing \- Suspend Desktop Sharing for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2gosuspend-desktopsharing\fR executes \fBx2goterminate-desktopsharing\fR and places a reminder file +.PP + ,,resume-desktopsharing'' +.PP +into +.PP + $HOME/.x2go/C-<session_id>/ +.PP +so that \fBx2godesktopsharing\fR can be resumed +on session resume. +.PP +\fBx2gosuspend-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2gosuspend-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2gosuspend-session(8), x2goterminate-desktopsharing(8), x2goresume-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2goterminate-desktopsharing.8 b/man/man8/x2goterminate-desktopsharing.8 new file mode 100644 index 0000000..b970b16 --- /dev/null +++ b/man/man8/x2goterminate-desktopsharing.8 @@ -0,0 +1,30 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goterminate-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goterminate-desktopsharing \- Cleanly Terminate Desktop Sharing for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2goterminate-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2goterminate-desktopsharing\fR allows to detect a running and associated \fBx2godesktopsharing\fR +applet and to cleanly terminate this applet. +.PP +\fBx2goterminate-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goterminate-desktopsharing\fR returns 0 if a \fBx2godesktopsharing\fR process could be identified +and terminated. If not, the exit code is -1. +.SH SEE ALSO +x2godesktopsharing(1), x2goteminate-session(8), x2gosuspend-desktopsharing(8), x2goresume-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-324-g752b012
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 752b012f49930a86ed9f7555a049cfd17312c291 (commit) from 048cd556385891d5992b208cf6af415670da3f2e (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 752b012f49930a86ed9f7555a049cfd17312c291 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 29 08:30:31 2011 +0200 Adapt to renaming of x2godesktopsharing scripts. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goresume-session | 2 +- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a9cbbf2..e881700 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,6 +103,7 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low x2gosuspend-session. * Provide pluggable X2go extension system for main X2go server functions. + * Adapt to renaming of x2godesktopsharing scripts. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 03adf97..c4f9158 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -90,7 +90,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # resume x2godesktopsharing, if it has been in use before the session got suspended - x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2godesktopsharing_resume $SESSION_NAME + x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing $SESSION_NAME # run x2goserver-extensions for post-resume x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-resume diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index ddb86d6..c2d627d 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -39,7 +39,7 @@ killall -HUP knotify &>/dev/null $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null # terminate x2godesktopsharing instance and remember that it was running... -x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2godesktopsharing-suspend $SESSION_NAME +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing $SESSION_NAME # run x2goserver-extensions for pre-suspend x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-suspend diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 72b4912..25be206 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -36,7 +36,7 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2godesktopsharing-terminate $SESSION_NAME +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing $SESSION_NAME # run x2goserver-extensions for pre-terminate x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-terminate 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits