[elpa] externals/ement 2e20df2700 3/7: Merge: D-Bus timeout fix

[ELPA Syncer]

branch: externals/ement
commit 2e20df27005f652c240ca109dfaeaaef2f98cd28
Merge: 640692f8f4 ebc1ff531e
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: D-Bus timeout fix
---
 README.org      | 1 +
 ement-notify.el | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 6d0ca3afdb..44f746a70f 100644
--- a/README.org
+++ b/README.org
@@ -302,6 +302,7 @@ Note that, while ~matrix-client~ remains usable, and 
probably will for some time
 *Fixes*
 + Command ~ement-describe-room~ for rooms without topics.
 + Improve insertion of old messages around existing timestamp headers.
++ Reduce D-Bus notification system check timeout to 2 seconds (from the 
default of 25).
 
 ** 0.2.1
 
diff --git a/ement-notify.el b/ement-notify.el
index 8faf18b9b2..b73eb605b9 100644
--- a/ement-notify.el
+++ b/ement-notify.el
@@ -52,7 +52,10 @@
   (and (featurep 'dbusbind)
        (require 'dbus nil :no-error)
        (dbus-ignore-errors (dbus-get-unique-name :session))
-       (dbus-ping :session "org.freedesktop.Notifications"))
+       ;; By default, emacs waits up to 25 seconds for a PONG.  Realistically, 
if there's
+       ;; no pong after 2000ms, there's pretty sure no notification service 
connected or
+       ;; the system's setup has issues.
+       (dbus-ping :session "org.freedesktop.Notifications" 2000))
   "Whether D-Bus notifications are usable.")
 
 ;;;; Customization