[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-211-ge34ee33

[X2Go dev team]

The branch, master has been updated
       via  e34ee331758845c3c09e251e96c78bd8451f3a71 (commit)
      from  4897263aded384247aff2172bd913cad6c496d4e (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 e34ee331758845c3c09e251e96c78bd8451f3a71
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 17 15:10:09 2012 +0200

    Fix missing declaration of notificationmessage_NotifierPopup.timeout.

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

Summary of changes:
 debian/changelog       |    1 +
 pyhoca/wxgui/notify.py |   11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index bfa6c51..1ff9341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Fix/improve --non-interactive command line option.
     - When packaging Windows binary with py2exe, use nxproxy-3.5.0.12.
     - When packaging Windows binary with py2exe, use VcXsrv-1.12.0.1.
+    - Fix missing declaration of notificationmessage_NotifierPopup.timeout.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index d909d6f..c7eb0c1 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -104,6 +104,7 @@ class notificationmessage_NotifierPopup(object):
     title = {}
     text = {}
     icon = {}
+    timeout = {}
 
     def __init__(self, _about):
         self._PyHocaGUI = _about._PyHocaGUI
@@ -136,6 +137,14 @@ class notificationmessage_NotifierPopup(object):
                 del self.icon[context]
             except KeyError:
                 pass
+            try:
+                timeout = self.timeout[context]
+                del self.timeout[context]
+            except KeyError:
+                pass
+
+        # libnotify timeouts are given in millisecs, on Windows we use seconds...
+        timeout = timeout / 1000
 
         _icon_map_wx = {
             'audio_error': wx.ICON_ERROR,
@@ -170,7 +179,7 @@ class notificationmessage_NotifierPopup(object):
                 _notification_msg.SetMessage(text)
                 _notification_msg.SetParent(self._PyHocaGUI.about)
                 _notification_msg.SetFlags(icon)
-                _notification_msg.Show(timeout=1)
+                _notification_msg.Show(timeout=timeout)
         except:
             # if we are running wxPython 2.8, we ignore missing 
             # wx.NotificationMessage class


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