[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-22-g17a0f93

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


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  17a0f93e9cdf6f96492995dc844ac6fca8edaef5 (commit)
      from  30dd0499b0199a0507d1a03454f56901d013d458 (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:
 pyhoca/wxgui/profilemanager.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 8bccf2d..01c939f 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -115,22 +115,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         if profile_id is not None:
             self.profile_id = profile_id
-        elif profile_name is not None:
-            self.profile_id = self.session_profiles.check_profile_id_or_name(profile_name)
-
-        if self.profile_id:
-            self.profile_name = self.session_profiles.to_profile_name(self.profile_id)
+        elif profile_name is not None and self.action in ('EDIT', 'EDIT_CONNECTED'):
+            self.profile_id = self.session_profiles.to_profile_id(profile_name)
+        else:
+            self.profile_id = None
 
         if self.action in ('EDIT', 'EDIT_CONNECTED') and self.profile_id:
+            self.profile_name = self.session_profiles.to_profile_name(self.profile_id)
             self.profile_config = self.session_profiles.get_profile_config(self.profile_id)
         elif self.action == 'COPY' and self.profile_id:
+            self.profile_name = self.session_profiles.to_profile_name(self.profile_id)
             self.profile_config = self.session_profiles.get_profile_config(self.profile_id)
-            self.profile_config['name'] = '<%s %s>' % (_('settings derived from '), self.profile_name)
+            self.profile_name = self.profile_config['name'] = '<%s %s>' % (_('settings derived from '), self.profile_name)
         else:
             # if self.action == 'ADD' ...
             self.profile_config = self.session_profiles.default_profile_config()
-            self.profile_config['name'] = '<%s>' %_('new session profile')
-
+            self.profile_name = self.profile_config['name'] = '<%s>' %_('new session profile')
 
         # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
         self.profile_config_bak = copy.deepcopy(self.profile_config)


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