diff options
| author | Travis Shirk <travis@pobox.com> | 2006-01-10 04:52:43 +0300 |
|---|---|---|
| committer | Travis Shirk <travis@pobox.com> | 2006-01-10 04:52:43 +0300 |
| commit | 94564e4e4eeda29c88a019d4bedb7e89fb5ea723 (patch) | |
| tree | 5d46bb4a15bc4c0c0ec1c532d623ab9d45feb70d | |
| parent | ec24013da8b1af0684a50657fd423fb3327b6750 (diff) | |
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
........
| -rw-r--r-- | src/notify.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/notify.py b/src/notify.py index 24564c399..119b366c6 100644 --- a/src/notify.py +++ b/src/notify.py @@ -212,10 +212,14 @@ class DesktopNotification: if self.notif is None: raise dbus.dbus_bindings.DBusException() 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(event_type), dbus.String(txt), [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.pending[self.id] = self |