[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.2.0.4-15-g549b097

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:22:31 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  549b097bab2e89387242942c620602a60868a485 (commit)
      from  f5ce305afc462a7be89f74d446813ce9b534e6e1 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |    2 ++
 pyhoca/wxgui/profilemanager.py |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 13b1e2f..2f71b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
     - Add a warning message box that DirectRDP is not yet supported by PyHoca-GUI.
     - Widen session type widget to make sure all widget (also when translated) fit
       in.
+    - Do not offer DirectRDP sessions in profile manager while connected to a real
+      X2Go server via SSH.
   * /debian/control:
     + Add Oleksandr Shneyder to Uploaders.
     + Depend on python-x2go (>=0.2.0.10-0~).
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index e29ea8a..2e9449b 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -78,6 +78,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profileManagerDefaults = defaults.X2GO_SESSIONPROFILE_DEFAULTS
         self.success = False
 
+        self.action = action
         self.sessionChoices = {
             'GNOME': _(u'GNOME Desktop (GNOME)'),
             'KDE': _(u'K Desktop Environment (KDE)'),
@@ -92,6 +93,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             'DirectRDP': 'Windows Terminal Server (direct RDP)',
             'CUSTOM': _(u'Custom command'),
             }
+        if self.action == 'EDIT_CONNECTED':
+            del self.sessionChoices['DirectRDP']
         self.applicationChoices = {
             'WWWBROWSER': _(u'Internet Browser'),
             'MAILCLIENT': _(u'Email Client'),
@@ -119,14 +122,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             'SAVEAS': _(u'Save incoming file as ...'),
         }
 
-
         self._compressions = defaults.pack_methods_nx3_noqual
         self.compressionChoices = {}
         for _comp in self._compressions:
             self.compressionChoices[_comp] = _comp
 
         self.session_profiles = self._PyHocaGUI.session_profiles
-        self.action = action
 
         if X2GOCLIENT_OS == 'Windows':
             self._textfield_height = 24


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)).




More information about the x2go-commits mailing list