Drop useless dbus-ping and fboundp (all errors ignored, anyway), that cause lockups on some systems.

Speed up code a bit.
This commit is contained in:
Evgenii Terechkov 2010-01-08 10:47:31 +07:00
parent 7c5dfede4d
commit 7d67638dfb
1 changed files with 14 additions and 16 deletions

View File

@ -75,22 +75,20 @@
(error nil)))
((eq jabber-libnotify-method 'dbus)
(condition-case e
(when (and (fboundp 'dbus-ping)
(dbus-ping :session "org.freedesktop.Notifications"))
(dbus-call-method
:session ; use the session (not system) bus
"org.freedesktop.Notifications" ; service name
"/org/freedesktop/Notifications" ; path name
"org.freedesktop.Notifications" "Notify" ; Method
jabber-libnotify-app
(jabber-libnotify-next-id)
jabber-libnotify-icon
':string (encode-coding-string
jabber-libnotify-message-header 'utf-8)
':string (encode-coding-string msg 'utf-8)
'(:array)
'(:array :signature "{sv}")
':int32 jabber-libnotify-timeout))
(dbus-call-method
:session ; use the session (not system) bus
"org.freedesktop.Notifications" ; service name
"/org/freedesktop/Notifications" ; path name
"org.freedesktop.Notifications" "Notify" ; Method
jabber-libnotify-app
(jabber-libnotify-next-id)
jabber-libnotify-icon
':string (encode-coding-string
jabber-libnotify-message-header 'utf-8)
':string (encode-coding-string msg 'utf-8)
'(:array)
'(:array :signature "{sv}")
':int32 jabber-libnotify-timeout)
(error nil)))))
(define-jabber-alert libnotify "Show a message through the libnotify interface"