[X2Go-Commits] pyhoca-gui.git - master (branch) updated: 0.4.0.1-11-g18e7c0a

[X2Go dev team]

The branch, master has been updated
       via  18e7c0a8a11ae17a1002fb36d83de8da7d54972b (commit)
      from  36bca6ba1d1e1e0c4516bba600d60850c3987b05 (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 18e7c0a8a11ae17a1002fb36d83de8da7d54972b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Apr 21 21:39:08 2013 +0200

    use classmethod for MakeIcon call

-----------------------------------------------------------------------

Summary of changes:
 pyhoca/wxgui/notify.py  |    4 ++--
 pyhoca/wxgui/taskbar.py |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index 62c5b7b..c155e77 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -25,7 +25,7 @@ if X2GOCLIENT_OS in ('Linux', 'Mac'):
     import pynotify
 import exceptions
 import basepath
-from taskbar import MakeIcon
+from taskbar import PyHocaGUI_TaskBarIcon
 
 import x2go.utils as utils
 
@@ -277,7 +277,7 @@ class notificationmessage_NotifierPopup(object):
                 _notification_msg.SetMessage(text)
                 _notification_msg.SetParent(self._PyHocaGUI.about)
                 _notification_msg.SetFlags(icon)
-                notification_icon = MakeIcon('pyhoca-trayicon')
+                notification_icon = PyHocaGUI_TaskBarIcon.MakeIcon('pyhoca-trayicon')
                 _notification_msg.UseTaskBarIcon(notification_icon)
                 _notification_msg.Show(timeout=timeout)
         except:
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 03dda9f..18391c7 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -148,6 +148,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
         self.menu_optionsmanager = self.PopupMenu(menus_taskbar.PyHocaGUI_Menu_TaskbarOptionsManager(self._PyHocaGUI, caller=self,))
         return self.menu_optionsmanager
 
+    @classmethod
     def MakeIcon(self, icon_name, fallback_name='pyhoca-trayicon'):
         """\
         The various platforms have different requirements for the


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)).