[X2Go-Commits] pyhoca-gui.git - master (branch) updated: 0.4.0.1-4-g6c800d1
X2Go dev team
git-admin at x2go.org
Thu Apr 11 14:19:49 CEST 2013
The branch, master has been updated
via 6c800d1d3c4aa478d47c0b8ecce8f9813d9ba85f (commit)
from b9cca13c17518fe387aaaca4ad8c10adf507167b (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 6c800d1d3c4aa478d47c0b8ecce8f9813d9ba85f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Apr 11 14:19:34 2013 +0200
Make sure that there is no KeyException when checking/unchecking the restoreexports item in the shared folders menu.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
pyhoca/wxgui/frontend.py | 2 +-
pyhoca/wxgui/menus_taskbar.py | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 13abcab..a0cfec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pyhoca-gui (0.4.0.2-0~x2go1) UNRELEASED; urgency=low
* New upstream version (0.4.0.2):
- Make PyHoca-GUI aware of the Cinnamon desktop shell.
+ - Make sure that there is no KeyException when checking/unchecking the
+ restoreexports item in the shared folders menu.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 13 Feb 2013 12:51:24 +0100
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 1cc930a..93cc9a9 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -715,7 +715,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
self.WakeUpIdle()
self.ExitMainLoop()
- self._remember_shared_folders[profile_name] = self.get_profile_config(profile_name)['restoreexports']
+ self._remember_shared_folders[profile_name] = self.get_profile_config(profile_name, 'restoreexports')
self.taskbar.SetIconIdle()
def OnSessionAuthenticate(self, evt, session_uuid=None):
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index cfcbe04..2d08231 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -371,6 +371,8 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
self.AppendSeparator()
_remember_shared_folders_item = self.AppendCheckItem(id=ID_REMEMBERSHAREDFOLDERS, text=_(u"Restore shares in next session"))
+ if not self._PyHocaGUI._remember_shared_folders.has_key(profile_name):
+ self._PyHocaGUI._remember_shared_folders[profile_name] = self._PyHocaGUI.get_profile_config(profile_name, 'restoreexports')
_remember_shared_folders_item.Check(self._PyHocaGUI._remember_shared_folders[profile_name])
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShareCustomLocalFolder, id=ID_SHARECUSTOMLOCALFOLDER)
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