The branch, master has been updated via 299bb0ee83d70c6c98cbc834e7d876cdff27d91f (commit) from 6da6228cee83ec4e383d149ba160af0e118a0f92 (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 299bb0ee83d70c6c98cbc834e7d876cdff27d91f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 29 09:58:24 2013 +0100 Don't crash if no notification-daemon provide is registered in DBUS. (Fixes: #321). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/notify.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 131085e..9abb3f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Support encrypted on SSH proxy whith password authentication on X2Go Server. - Implement two-factor authentication. + - Don't crash if no notification-daemon provide is registered in DBUS. + (Fixes: #321). * /debian/copyright: + Update file. Add entry for file icon2exe.py. diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 31d8fd4..197f70f 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -132,12 +132,14 @@ class libnotify_NotifierPopup(object): if title and text: self._pyhoca_logger('[%s] %s' % (title.encode(utils.get_encoding()), text.encode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) - if not self._PyHocaGUI.disable_notifications and title and text: - n = pynotify.Notification(title, text, icon) - n.set_urgency(pynotify.URGENCY_NORMAL) - n.set_timeout(timeout) - if not n.show(): - raise PyHocaNotificationException('could not notify user') + try: + if not self._PyHocaGUI.disable_notifications and title and text: + n = pynotify.Notification(title, text, icon) + n.set_urgency(pynotify.URGENCY_NORMAL) + n.set_timeout(timeout) + n.show() + except: + pass def Close(self): """\ 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)).