This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 0951030fa43fdb6df1d046cded631018be578e7b (commit)
from 090c983aa3b0e7a72f059455cfdeac9d799ea5fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0951030fa43fdb6df1d046cded631018be578e7b
Author: Adam Sjøgren <as...@ko...>
Date: Tue Aug 12 19:10:55 2014 +0200
Use avatar from cache in notifications.el notifications
It seems that (get jid 'avatar) has started returning something
different than previously (a binary blob, instead of a plist).
diff --git a/jabber-notifications.el b/jabber-notifications.el
index d947311..cb7963b 100644
--- a/jabber-notifications.el
+++ b/jabber-notifications.el
@@ -59,11 +59,12 @@
(or title
(or jabber-notifications-message-header " ")
text)))
- (avatar (get (jabber-jid-symbol from) 'avatar)))
+ (avatar-hash (get (jabber-jid-symbol from) 'avatar-hash)))
(notifications-notify
:title title
:body body
- :app-icon (or (and avatar (plist-get (cdr avatar) ':file)) jabber-notifications-icon)
+ :app-icon (or (and avatar-hash (jabber-avatar-find-cached avatar-hash))
+ jabber-notifications-icon)
:app-name jabber-notifications-app
:category "jabber.message"
:timeout jabber-notifications-timeout)))
-----------------------------------------------------------------------
Summary of changes:
jabber-notifications.el | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
emacs-jabber
|
