The branch, twofactorauth has been updated discards dd379e7009d8bf7a6ae496aeeb86ba7defa7c0c9 (commit) via 40f35ae22d7b0397b6d97ef15311cfc8716a7131 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (dd379e7009d8bf7a6ae496aeeb86ba7defa7c0c9) \ N -- N -- N (40f35ae22d7b0397b6d97ef15311cfc8716a7131) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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/frontend.py | 3 ++- pyhoca/wxgui/menus_taskbar.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 463dec8..d1493c7 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -612,9 +612,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _pp_dialog = printingprefs.PyHocaGUI_PrintingPreferences(self, mode='print', profile_name=profile_name, session_name=session_name) while _pp_dialog in self._sub_windows: _print_action = _pp_dialog.get_print_action() + _print_action_properties = _pp_dialog.get_print_action_properties() gevent.sleep(.2) - return _print_action + return _print_action, _print_action_properties def HOOK_printaction_error(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN', err_msg='GENERIC_ERROR', printer=None): if printer: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 1f4b94b..945bdd0 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -277,9 +277,13 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu): self._PyHocaGUI.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=_this_id) if not _profile_names: - _dummy = self.Append(text=_('No session profiles defined'), id=wx.NewId()) + if not filter_profiles: + _dummy = self.Append(text=_(u'No session profiles defined'), id=wx.NewId()) + else: + _dummy = self.Append(text=_(u'All session profiles are connected'), id=wx.NewId()) _dummy.Enable(False) + def OnUpdateUI(self, evt): profile_name = self._PyHocaGUI._eventid_profilenames_map[evt.GetId()] if profile_name in self._PyHocaGUI._temp_disabled_profile_names: 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)).