The branch, twofactorauth has been updated via ed0d93497a82325affb05fcb3b31afabde1bdd44 (commit) from 08107b765e23fa977ae198bde67251d31facd7ab (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 | 3 ++- pyhoca/wxgui/listdesktops.py | 2 +- pyhoca/wxgui/logon.py | 2 +- pyhoca/wxgui/profilemanager.py | 1 + pyhoca/wxgui/serverinfo.py | 2 +- pyhoca/wxgui/sessiontitle.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08b78f4..5fe52c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-gui (0.4.0.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.5): + - Make PyHoca-GUI aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 19 Jul 2013 22:34:41 +0200 diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py index 6ea5bf0..f112b3e 100644 --- a/pyhoca/wxgui/listdesktops.py +++ b/pyhoca/wxgui/listdesktops.py @@ -143,7 +143,7 @@ class PyHocaGUI_DialogBoxListDesktops(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index f50bc97..b3e8e7e 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -218,7 +218,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index e0eb785..408e985 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -78,6 +78,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.sessionChoices = { 'CINNAMON': _(u'Cinnamon Desktop (CINNAMON)'), 'GNOME': _(u'GNOME Desktop (GNOME)'), + 'MATE': _(u'MATE Desktop (MATE)'), 'KDE': _(u'K Desktop Environment (KDE)'), 'LXDE': _(u'Lightweight X Desktop (LXDE)'), 'TRINITY': _(u'Trinity X Desktop (KDE3-like)'), diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py index 7a3ffba..e3b03ee 100644 --- a/pyhoca/wxgui/serverinfo.py +++ b/pyhoca/wxgui/serverinfo.py @@ -120,7 +120,7 @@ class PyHocaGUI_DialogBoxServerInfo(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 75d4ea8..111fd46 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -119,7 +119,7 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog): else: move_y = self._PyHocaGUI.logon_window_position_y - elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): + elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'mate', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )): # automatically place logon Window for GNOME, awesome move_x = maxX - (self.GetSize().GetWidth() + 20) 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)).