copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

determine the version of libnotify before sending it a message. Fixes #1347

This commit is contained in:
Yann Leboulanger 2006-01-13 20:33:43 +00:00
parent b34005da3d
commit f8652420e7
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/notify.py
View File

@ -210,13 +210,25 @@ class DesktopNotification:
if self.notif is None: if self.notif is None:
raise dbus.dbus_bindings.DBusException() raise dbus.dbus_bindings.DBusException()
timeout = gajim.config.get('notification_timeout') # in seconds timeout = gajim.config.get('notification_timeout') # in seconds
# Determine the version of notifications
# FIXME: This code is blocking, as is the next set. That should be fixed
# now that we have a class to encapsulate this behavior
try:
(name, vendor, version) = self.notif.GetServerInfo()
except:
# No way to determine the version number, set it to the latest
# since it doesn't properly support the version number
version = '0.3.1'
if version.startswith('0.2'):
try: try:
self.id = self.notif.Notify(dbus.String(_('Gajim')), self.id = self.notif.Notify(dbus.String(_('Gajim')),
dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0),
dbus.String(event_type), dbus.String(txt), dbus.String(event_type), dbus.String(txt),
[dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32( [dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32(
timeout)) timeout))
except AttributeError: # For libnotify 0.3.x except AttributeError:
version = '0.3.1' # we're actually dealing with the newer version
if version.startswith('0.3'):
self.id = self.notif.Notify(dbus.String(_('Gajim')), self.id = self.notif.Notify(dbus.String(_('Gajim')),
dbus.String(path), dbus.UInt32(0), dbus.String(event_type), dbus.String(path), dbus.UInt32(0), dbus.String(event_type),
dbus.String(txt), dbus.String(''), {}, dbus.UInt32(timeout*1000)) dbus.String(txt), dbus.String(''), {}, dbus.UInt32(timeout*1000))