emacs-jabber jabber-chat.el,1.87,1.88 jabber-muc.el,1.73,1.74

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30400

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

Don't print nickname for /me messages


Index: jabber-chat.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chat.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- jabber-chat.el	6 Feb 2008 16:19:03 -0000	1.87
+++ jabber-chat.el	1 Mar 2008 20:42:46 -0000	1.88
@@ -349,7 +349,11 @@
 	 (original-timestamp (when (listp (cadr data))
 			       (jabber-xml-path (cadr data) '(("jabber:x:delay" . "x")))))
 	 (internal-time
-	  (plist-get (cddr data) :time)))
+	  (plist-get (cddr data) :time))
+	 (body (jabber-xml-path (cadr data) '(body "")))
+	 (/me-p
+	  (and (> (length body) 4)
+	       (string= (substring body 0 4) "/me "))))
 
     ;; Print prompt...
     (let ((delayed (or original-timestamp (plist-get (cddr data) :delayed))))
@@ -357,20 +361,22 @@
 	(:local
 	 (jabber-chat-self-prompt (or (jabber-x-delay original-timestamp)
 				      internal-time)
-				  delayed))
+				  delayed
+				  /me-p))
 	(:foreign
 	 ;; For :error and :notice, this might be a string... beware
 	 (jabber-chat-print-prompt (when (listp (cadr data)) (cadr data)) 
 				   (or (jabber-x-delay original-timestamp)
 				       internal-time)
-				   delayed))
+				   delayed
+				   /me-p))
 	((:error :notice :subscription-request)
 	 (jabber-chat-system-prompt (or (jabber-x-delay original-timestamp)
 					internal-time)))
 	(:muc-local
-	 (jabber-muc-print-prompt (cadr data) t))
+	 (jabber-muc-print-prompt (cadr data) t /me-p))
         (:muc-foreign
-         (jabber-muc-print-prompt (cadr data)))
+         (jabber-muc-print-prompt (cadr data) nil /me-p))
 	((:muc-notice :muc-error)
 	 (jabber-muc-system-prompt))))
     
@@ -439,13 +445,14 @@
 					    (jabber-message-time data))))
       (ewoc-enter-before jabber-chat-ewoc node (list :rare-time (jabber-message-time data))))))
 
-(defun jabber-chat-print-prompt (xml-data timestamp delayed)
+(defun jabber-chat-print-prompt (xml-data timestamp delayed dont-print-nick-p)
   "Print prompt for received message in XML-DATA.
 TIMESTAMP is the timestamp to print, or nil to get it
 from a jabber:x:delay element.
 If DELAYED is true, print long timestamp
 \(`jabber-chat-delayed-time-format' as opposed to
-`jabber-chat-time-format')."
+`jabber-chat-time-format').
+If DONT-PRINT-NICK-P is true, don't include nickname."
   (let ((from (jabber-xml-get-attribute xml-data 'from))
 	(timestamp (or timestamp
 		       (car (delq nil (mapcar 'jabber-x-delay (jabber-xml-get-children xml-data 'x)))))))
@@ -457,7 +464,7 @@
 					 jabber-chat-delayed-time-format
 				       jabber-chat-time-format)
 				     timestamp))
-			   (cons ?n (jabber-jid-displayname from))
+			   (cons ?n (if dont-print-nick-p "" (jabber-jid-displayname from)))
 			   (cons ?u (or (jabber-jid-username from) from))
 			   (cons ?r (jabber-jid-resource from))
 			   (cons ?j (jabber-jid-user from))))
@@ -479,12 +486,13 @@
 	   'help-echo
 	   (concat (format-time-string "System message on %Y-%m-%d %H:%M:%S" timestamp)))))
 
-(defun jabber-chat-self-prompt (timestamp delayed)
+(defun jabber-chat-self-prompt (timestamp delayed dont-print-nick-p)
   "Print prompt for sent message.
 TIMESTAMP is the timestamp to print, or nil for now.
 If DELAYED is true, print long timestamp
 \(`jabber-chat-delayed-time-format' as opposed to
-`jabber-chat-time-format')."
+`jabber-chat-time-format').
+If DONT-PRINT-NICK-P is true, don't include nickname."
   (let* ((state-data (fsm-get-state-data jabber-buffer-connection))
 	 (username (plist-get state-data :username))
 	 (server (plist-get state-data :server))
@@ -498,7 +506,7 @@
 					 jabber-chat-delayed-time-format
 				       jabber-chat-time-format)
 				     timestamp))
-			   (cons ?n nickname)
+			   (cons ?n (if dont-print-nick-p "" nickname))
 			   (cons ?u username)
 			   (cons ?r resource)
 			   (cons ?j (concat username "@" server))))

Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- jabber-muc.el	8 Feb 2008 19:11:57 -0000	1.73
+++ jabber-muc.el	1 Mar 2008 20:42:47 -0000	1.74
@@ -765,7 +765,7 @@
 			(jabber-xml-node-attributes
 			 (car (jabber-xml-get-children x-muc 'item))))))
 
-(defun jabber-muc-print-prompt (xml-data &optional local)
+(defun jabber-muc-print-prompt (xml-data &optional local dont-print-nick-p)
   "Print MUC prompt for message in XML-DATA."
   (let ((nick (jabber-jid-resource (jabber-xml-get-attribute xml-data 'from)))
 	(timestamp (car (delq nil (mapcar 'jabber-x-delay (jabber-xml-get-children xml-data 'x))))))
@@ -778,7 +778,7 @@
 					     jabber-chat-delayed-time-format
 					   jabber-chat-time-format)
 					 timestamp))
-			       (cons ?n nick)
+			       (cons ?n (if dont-print-nick-p "" nick))
 			       (cons ?u nick)
 			       (cons ?r nick)
 			       (cons ?j (concat jabber-group "/" nick))))