From 7d67638dfbb1d84844223739e8ae27440313130f Mon Sep 17 00:00:00 2001 From: Evgenii Terechkov Date: Fri, 8 Jan 2010 10:47:31 +0700 Subject: [PATCH] Drop useless dbus-ping and fboundp (all errors ignored, anyway), that cause lockups on some systems. Speed up code a bit. --- jabber-libnotify.el | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/jabber-libnotify.el b/jabber-libnotify.el index 60f29fe..9ff28a4 100644 --- a/jabber-libnotify.el +++ b/jabber-libnotify.el @@ -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"