[X2Go-Commits] [pyhoca-gui] 01/01: pyhoca/wxgui/menus_taskbar.py: Fix AppendMenu wrapper. (All self.AppendMenu implementations lacked a return statement).

git-admin at x2go.org git-admin at x2go.org
Fri Dec 27 13:52:31 CET 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-gui.

commit 5e1ac1bed04dd0db6e14c405c0250a879d24aa02
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 27 12:52:23 2019 +0000

    pyhoca/wxgui/menus_taskbar.py: Fix AppendMenu wrapper. (All self.AppendMenu implementations lacked a return statement).
---
 debian/changelog              |  2 ++
 pyhoca/wxgui/menus_taskbar.py | 17 +++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0a0041..55a9ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ pyhoca-gui (0.6.1.1-0x2go1) UNRELEASED; urgency=medium
     - pyhoca/wxgui/frontend.py: Fix loading PyHocaGUI_DialogBoxPassphrase from
       wrong module (passphrase -> logon).
     - pyhoca/wxgui/logon.py: Use wx.Cursor with wxgtk4.0.
+    - pyhoca/wxgui/menus_taskbar.py: Fix AppendMenu wrapper. (All self.AppendMenu
+      implementations lacked a return statement).
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 27 Dec 2019 07:42:21 +0100
 
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 9ea048e..635b8db 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -93,10 +93,7 @@ class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu):
                 self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileDelete, id=ID_DELETEPROFILE)
 
     def AppendMenu(self, *args, **kwargs):
-        if wx_major < 4:
-            return wx.Menu.AppendMenu(self, *args, **kwargs)
-        else:
-            return wx.Menu.Append(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)
 
 
 class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
@@ -185,7 +182,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
         self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
 
     def AppendMenu(self, *args, **kwargs):
-        _legacy_wrap_AppendMenu(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)
 
 
 class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
@@ -328,7 +325,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
         self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionTerminate, id=ID_TERMINATESESSION)
 
     def AppendMenu(self, *args, **kwargs):
-        _legacy_wrap_AppendMenu(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)
 
 
 class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
@@ -446,7 +443,7 @@ class PyHocaGUI_Menu_LaunchSingleApplication(wx.Menu):
             self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnApplicationStart, id=_app_id)
 
     def AppendMenu(self, *args, **kwargs):
-        _legacy_wrap_AppendMenu(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)
 
 
 def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=None, session_name=None):
@@ -885,7 +882,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                 self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
 
     def AppendMenu(self, *args, **kwargs):
-        _legacy_wrap_AppendMenu(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)
 
 
 class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
@@ -1046,7 +1043,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
             self.Enable(id=evt.GetId(), enable=True)
 
     def AppendMenu(self, *args, **kwargs):
-        _legacy_wrap_AppendMenu(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)
 
 
 class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
@@ -1116,4 +1113,4 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
         self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
 
     def AppendMenu(self, *args, **kwargs):
-        _legacy_wrap_AppendMenu(self, *args, **kwargs)
+        return _legacy_wrap_AppendMenu(self, *args, **kwargs)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git


More information about the x2go-commits mailing list