The branch, master has been updated via 36bca6ba1d1e1e0c4516bba600d60850c3987b05 (commit) from 288f8f2637ccec75be0a6ef2f4921e1e71355d77 (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 36bca6ba1d1e1e0c4516bba600d60850c3987b05 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Apr 21 21:35:49 2013 +0200 Explicitly set the tray icon for wx.NotificationMessage calls. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/notify.py | 3 +++ 2 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index afe2f42..dd6f5ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ pyhoca-gui (0.4.0.2-0~x2go1) UNRELEASED; urgency=low + Provide icon2exe.py for adding .ico files to .exe files. Thanks to the original authors: Giovanni Bajo and previously McMillan Enterprises, Inc. + + Explicitly set the tray icon for wx.NotificationMessage calls. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Feb 2013 12:51:24 +0100 diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 8a462b2..62c5b7b 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -25,6 +25,7 @@ if X2GOCLIENT_OS in ('Linux', 'Mac'): import pynotify import exceptions import basepath +from taskbar import MakeIcon import x2go.utils as utils @@ -276,6 +277,8 @@ class notificationmessage_NotifierPopup(object): _notification_msg.SetMessage(text) _notification_msg.SetParent(self._PyHocaGUI.about) _notification_msg.SetFlags(icon) + notification_icon = MakeIcon('pyhoca-trayicon') + _notification_msg.UseTaskBarIcon(notification_icon) _notification_msg.Show(timeout=timeout) except: # if we are running wxPython 2.8, we ignore missing 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)).