Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix call to notifications-notify on Mac OS where dbus isn't available #2959

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions el-get-notify.el
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ fallback."
"Notify the user using either the dbus based API or the `growl' one"
(when (not (eq el-get-notify-type 'message))
(unless (and (fboundp 'dbus-register-signal)
(boundp 'dbus-compiled-version)
;; avoid a bug in Emacs 24.0 under darwin
(ignore-errors (require 'notifications nil t)))
;; else try notify.el, there's a recipe for it
Expand All @@ -67,12 +68,13 @@ fallback."
;; Message only
((equal el-get-notify-type 'message) (error "Use `message' instead"))
;; Graphical notification
((fboundp 'notifications-notify) (notifications-notify :title title
:app-name "el-get"
:app-icon (concat
(el-get-package-directory "el-get")
"/logo/el-get.png")
:body message))
((and (fboundp 'notifications-notify) (boundp 'dbus-compiled-version))
(notifications-notify :title title
:app-name "el-get"
:app-icon (concat
(el-get-package-directory "el-get")
"/logo/el-get.png")
:body message))
((fboundp 'notify) (notify title message))
((fboundp 'el-get-growl) (el-get-growl title message))
;; Fallback
Expand Down
Loading