[X2Go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.4.0.8-6-g6706416
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:22:03 CET 2014
The branch, build-main has been updated
via 6706416c0874f361a68d67072f3abb76fb733cbe (commit)
from b7f65e1b9ca6090dfdc64cfc7efc84d352d49fab (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
pyhoca/wxgui/notify.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d5acf11..2bf268e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
- Make notifications more robust.
- Add support for encrypted/locked/passphrase-protected SSH private key
files.
+ - Only show notifications if there really is something to show.
* /debian/copyright:
+ Update file. Add entry for file icon2exe.py.
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index b1362f9..31d8fd4 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -132,7 +132,7 @@ 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:
+ 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)
@@ -270,7 +270,7 @@ class showballoon_NotifierPopup(object):
icon = wx.ICON_INFORMATION
try:
- if not self._PyHocaGUI.disable_notifications:
+ if not self._PyHocaGUI.disable_notifications and title and text:
# you will need wxPython >= 2.9 for this
self._PyHocaGUI.taskbar.ShowBalloon(
title,
@@ -424,7 +424,7 @@ class notificationmessage_NotifierPopup(object):
icon = wx.ICON_INFORMATION
try:
- if not self._PyHocaGUI.disable_notifications:
+ if not self._PyHocaGUI.disable_notifications and title and text:
# you will need wxPython >= 2.9 for this
_notification_msg = wx.NotificationMessage()
_notification_msg.SetTitle(title)
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)).
More information about the x2go-commits
mailing list