* erc-desktop-notifications.el (erc-notifications-bus):

New customer option.  Supports cases when Emacs hasn't been
invoked in the same environment where the notifications shall go to.
(erc-notifications-notify): Use it.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 9b8ec66ff55ff817073691ae8b592f4072602f99..2004de41d0b49c43e96d4066747dd5c03efa8e9b 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-23  Michael Albinus  <michael.albinus@gmx.de>
+
+       * erc-desktop-notifications.el (erc-notifications-bus):
+       New customer option.  Supports cases when Emacs hasn't been
+       invoked in the same environment where the notifications shall go to.
+       (erc-notifications-notify): Use it.
+
 2014-11-10  Kelvin White  <kwhite@gnu.org>
 
        * erc-stamp.el (erc-timestamp-intangible): Change version tag to 24.5.

diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el
index c0362b773dd72394589cb82b53562b2ccbea5f6a..c8945cf93197cf840184042443954240d0080d7e 100644 (file)
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -46,6 +46,12 @@
   :group 'erc-notifications
   :type '(choice (const :tag "No icon" nil) file))
 
+(defcustom erc-notifications-bus :session
+  "D-Bus bus to use for notification."
+  :version "24.5"
+  :group 'erc-notifications
+  :type '(choice (const :tag "Session bus" :session) string))
+
 (defvar dbus-debug) ; used in the macroexpansion of dbus-ignore-errors
 
 (defun erc-notifications-notify (nick msg)
@@ -53,7 +59,8 @@
 This will replace the last notification sent with this function."
   (dbus-ignore-errors
     (setq erc-notifications-last-notification
-          (notifications-notify :title (xml-escape-string nick)
+          (notifications-notify :bus erc-notifications-bus
+                               :title (xml-escape-string nick)
                                 :body (xml-escape-string msg)
                                 :replaces-id erc-notifications-last-notification
                                 :app-icon erc-notifications-icon))))