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 4891befb7d947c132dfd8b0de4a322d8751f9d0f (commit)
from 2ada81d8664763700430d3e6aa9ea776e712631a (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 4891befb7d947c132dfd8b0de4a322d8751f9d0f
Author: Magnus Henoch <mag...@gm...>
Date: Tue Sep 30 20:08:32 2014 +0100
Display nickname for contacts added to / removed from roster
diff --git a/jabber-presence.el b/jabber-presence.el
index 1809abd..5f4573d 100644
--- a/jabber-presence.el
+++ b/jabber-presence.el
@@ -66,7 +66,9 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise."
;; If subscripton="remove", contact is to be removed from roster
(if (string= (jabber-xml-get-attribute item 'subscription) "remove")
(progn
- (message "%s removed from roster" jid)
+ (if (jabber-jid-rostername jid)
+ (message "%s (%s) removed from roster" (jabber-jid-rostername jid) jid)
+ (message "%s removed from roster" jid))
(push jid deleted-items))
;; Find contact if already in roster
@@ -76,7 +78,9 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise."
(push roster-item changed-items)
;; If not found, create a new roster item.
(unless (eq closure-data 'initial)
- (message "%s added to roster" jid))
+ (if (jabber-xml-get-attribute item 'name)
+ (message "%s (%s) added to roster" (jabber-xml-get-attribute item 'name) jid)
+ (message "%s added to roster" jid)))
(setq roster-item jid)
(push roster-item new-items))
-----------------------------------------------------------------------
Summary of changes:
jabber-presence.el | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
emacs-jabber
|
