This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 301225f release 0.5.0.4 new 3412f4f Continue development... new e44e848 Handle notification the GTK3-way. (Fixes: #769). new f5d975c debian/control,pyhoca-gui.specs: Pull-in gobject introspection packages for libnotify support. Fallback to pynotify (GTK2 based notifcations) only if gi.repository.Notify is unavailable. (Fixes: #689). The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 11 +++++++++++ debian/control | 3 ++- man/man1/pyhoca-gui.1 | 2 +- pyhoca-gui.spec | 12 +++++++++++- pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/notify.py | 19 +++++++++++++++---- 6 files changed, 41 insertions(+), 8 deletions(-) -- Alioth's /srv/git/code.x2go.org/pyhoca-gui.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 3412f4fc869433632b2c2f66a1dac9c118f9a3cc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed May 27 11:47:26 2015 +0200 Continue development... --- debian/changelog | 6 ++++++ man/man1/pyhoca-gui.1 | 2 +- pyhoca-gui.spec | 2 +- pyhoca/wxgui/__init__.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70d486f..ec3730d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-gui (0.5.0.5-0x2go1) UNRELEASED; urgency=medium + + * Continue development... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 27 May 2015 11:46:24 +0200 + pyhoca-gui (0.5.0.4-0x2go1) unstable; urgency=medium [ Mike Gabriel ] diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 0b0ecb5..a4a2c62 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pyhoca-gui 1 "Jan 2015" "Version 0.5.0.4" "X2Go Application" +.TH pyhoca-gui 1 "May 2015" "Version 0.5.0.5" "X2Go Application" .SH NAME pyhoca-gui \- graphical X2Go client applet written in Python .SH SYNOPSIS diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index 708257f..50cec02 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -1,5 +1,5 @@ Name: pyhoca-gui -Version: 0.5.0.4 +Version: 0.5.0.5 Release: 0.0x2go1%{?dist} Summary: Graphical X2Go client written in (wx)Python diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 1083693..a78cf4e 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,4 +18,4 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.5.0.4' +__VERSION__ = '0.5.0.5' -- Alioth's /srv/git/code.x2go.org/pyhoca-gui.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit e44e848415eff3e4dab69e990adfc447e79143f8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed May 27 11:50:04 2015 +0200 Handle notification the GTK3-way. (Fixes: #769). --- debian/changelog | 3 ++- pyhoca/wxgui/notify.py | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec3730d..0b6c3fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-gui (0.5.0.5-0x2go1) UNRELEASED; urgency=medium - * Continue development... + * New upstream version (0.5.0.5): + - Handle notification the GTK3-way. (Fixes: #769). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 27 May 2015 11:46:24 +0200 diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index bc49028..53fe93b 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -22,7 +22,13 @@ import wx from x2go import X2GOCLIENT_OS from x2go import log if X2GOCLIENT_OS in ('Linux', 'Mac'): - import pynotify + try: + # try the GTK3 way for notification support first... + from gi.repository import Notify as _Notify + except ImportError: + # GTK3 notifications are unavailable, + # hopefully pynotify / GTK2-based notifications are available then... + import pynotify as _Notify import exceptions import basepath @@ -52,7 +58,7 @@ class libnotify_NotifierPopup(object): self._PyHocaGUI = _PyHocaGUI self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger - if not pynotify.init("PyHocaGUI"): + if not _Notify.init("PyHocaGUI"): raise NotSupportedException def prepare(self, context, title=None, text=None, icon=None, timeout=None): @@ -132,8 +138,13 @@ class libnotify_NotifierPopup(object): try: if not self._PyHocaGUI.disable_notifications and title and text: - n = pynotify.Notification(title, text, icon) - n.set_urgency(pynotify.URGENCY_NORMAL) + try: + n = _Notify.Notification.new(title, text, icon) + n.set_urgency(_Notify.Urgency.NORMAL) + except AttributeError: + # handle pynotify / GTK2-based notifications + n = _Notify.Notification(title, text, icon) + n.set_urgency(_Notify.URGENCY_NORMAL) n.set_timeout(timeout) n.show() except: -- Alioth's /srv/git/code.x2go.org/pyhoca-gui.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit f5d975cab2dc6fd47c77145a281e3c3a89cbbcdb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed May 27 12:16:25 2015 +0200 debian/control,pyhoca-gui.specs: Pull-in gobject introspection packages for libnotify support. Fallback to pynotify (GTK2 based notifcations) only if gi.repository.Notify is unavailable. (Fixes: #689). --- debian/changelog | 4 ++++ debian/control | 3 ++- pyhoca-gui.spec | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b6c3fe..2e756a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ pyhoca-gui (0.5.0.5-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.5.0.5): - Handle notification the GTK3-way. (Fixes: #769). + * debian/control,pyhoca-gui.specs: + + Pull-in gobject introspection packages for libnotify support. + Fallback to pynotify (GTK2 based notifcations) only if + gi.repository.Notify is unavailable. (Fixes: #689). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 27 May 2015 11:46:24 +0200 diff --git a/debian/control b/debian/control index cd537e4..bd27c96 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,8 @@ Depends: python, python-x2go (>=0.5.0.0-0~), python-argparse, - python-notify, + python-gi | python-notify, + gir1.2-notify-0.7 | python-notify, python-setproctitle, python-wxgtk3.0 | python-wxgtk2.8, python-support (>=0.90), diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index 50cec02..043174a 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -26,10 +26,20 @@ BuildRequires: intltool Requires: python-setproctitle Requires: python-x2go >= 0.5.0.0 %if 0%{?suse_version} +%if 0%{?suse_version} >= 1230 +Requires: python-gobject +Requires: typelib-1_0-Notify-0_7 +%else Requires: python-notify +%endif +%else +%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 +Requires: libnotify +Requires: pygobject3-base %else Requires: notify-python %endif +%endif %if 0%{?suse_version} >= 1230 Requires: python-wxWidgets-2_9 %else -- Alioth's /srv/git/code.x2go.org/pyhoca-gui.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org