emacs-jabber AUTHORS,1.10,1.11 jabber-activity.el,1.28,1.29

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv31821

Modified Files:
	AUTHORS jabber-activity.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-375
Creator:  Magnus Henoch <ma...@fr...>

Make jabber-activity-add work properly when jabber-chat-buffer-format contains %r

Patch by Olivier Ramonat.


Index: jabber-activity.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-activity.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- jabber-activity.el	16 Jul 2007 18:04:29 -0000	1.28
+++ jabber-activity.el	7 Aug 2007 17:02:19 -0000	1.29
@@ -267,13 +267,9 @@
 
 (defun jabber-activity-add (from buffer text proposed-alert)
   "Add a JID to mode line when `jabber-activity-show-p'"
-  ;; In case of private MUC message, we want to keep the full JID.
-  (let ((jid (if (jabber-muc-sender-p from)
-		 from
-	       (jabber-jid-user from))))
-    (when (funcall jabber-activity-show-p jid)
-      (add-to-list 'jabber-activity-jids jid)
-      (jabber-activity-mode-line-update))))
+  (when (funcall jabber-activity-show-p from)
+    (add-to-list 'jabber-activity-jids from)
+    (jabber-activity-mode-line-update)))
 
 (defun jabber-activity-add-muc (nick group buffer text proposed-alert)
   "Add a JID to mode line when `jabber-activity-show-p'"

Index: AUTHORS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/AUTHORS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- AUTHORS	16 Jul 2007 18:04:29 -0000	1.10
+++ AUTHORS	7 Aug 2007 17:02:19 -0000	1.11
@@ -12,6 +12,7 @@
 Justin Kirby
 Kirill A. Korinskiy
 Carl Henrik Lunde
+Olivier Ramonat
 Andrey Slusar
 Evgenii Terechkov
 Milan Zamazal