Merged revisions 5066-5067 via svnmerge from
svn://svn.gajim.org/gajim/trunk ........ r5066 | asterix | 2006-01-09 12:12:52 -0700 (Mon, 09 Jan 2006) | 2 lines [Tomasz Torcz] libnotify API changed in 0.3. Fixes #1347 ........ r5067 | asterix | 2006-01-09 12:48:33 -0700 (Mon, 09 Jan 2006) | 2 lines initialize gajim.gc_connected[account][room_jid] when we create a new room ........
This commit is contained in:
parent
ec24013da8
commit
94564e4e4e
|
@ -212,10 +212,14 @@ 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
|
||||||
self.id = self.notif.Notify(dbus.String(_('Gajim')),
|
try: 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(timeout))
|
[dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32(timeout))
|
||||||
|
except AttributeError: # For libnotify 0.3.x
|
||||||
|
self.id = self.notif.Notify(dbus.String(_('Gajim')),
|
||||||
|
dbus.String(path), dbus.UInt32(0), dbus.String(event_type),
|
||||||
|
dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout/1000))
|
||||||
notification_response_manager.attach_to_interface()
|
notification_response_manager.attach_to_interface()
|
||||||
notification_response_manager.pending[self.id] = self
|
notification_response_manager.pending[self.id] = self
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue