The branch, master has been updated via 718e39e05816677779b7481dcf10dfd122fdd31f (commit) from c336e8a87da20287a0631a78e37a74118dc9c06f (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 718e39e05816677779b7481dcf10dfd122fdd31f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 1 14:05:14 2011 +0200 Unicode fix for Windows notifications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 +++++++++-- pyhoca/wxgui/notify.py | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 461ee18..0c41724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.1.0.6-0~x2go3) UNRELEASED; urgency=low + + * New upstream version (0.1.0.6): + - unicode fix for Windows notifications + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 01 Jul 2011 14:04:42 +0200 + +pyhoca-gui (0.1.0.5-0~x2go1) unstable; urgency=low * New upstream version (0.1.0.5): - bugfix release @@ -16,7 +23,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low * React to bug #627990, prefer man2html-base over man2html. * Depend on Python X2go 0.1.1.2 - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 01 Jul 2011 13:55:42 +0200 pyhoca-gui (0.1.0.4-0~x2go1) unstable; urgency=low diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index b0a2160..7660a36 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -173,7 +173,13 @@ class notificationmessage_NotifierPopup(object): # wx.NotificationMessage class pass - self._pyhoca_logger('[%s] %s' % (title.encode(utils.get_encoding()), text.encode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) + # on Windows some error messages are already encoded, some are not, depending from which module they come + try: _title = title.encode(utils.get_encoding()) + except: _title = title + try: _text = text.encode(utils.get_encoding()) + except: _text = text + + self._pyhoca_logger('[%s] %s' % (_title, _text), loglevel=log.loglevel_NOTICE) def Close(self): pass 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)).