X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-handle.el;h=edb916df4df7130fc1b4a755c4ffdcc02ac5f675;hp=17d4b096c1ab147846c58b29f2ae543a6d6aa189;hb=f88a663c1b379044573897f6f2ae44e5f5172ed6;hpb=c25d70d909973165534487d5cd529a11b5987f43

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 17d4b09..edb916d 100644
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -67,16 +67,15 @@
   (let* ((user (riece-prefix-nickname prefix))
 	 (parameters (riece-split-parameters string))
 	 (targets (split-string (car parameters) ","))
-	 (message (nth 1 parameters))
-	 (speaker (riece-make-identity user riece-server-name)))
+	 (message (nth 1 parameters)))
     (riece-display-message
-     (riece-make-message speaker
+     (riece-make-message (riece-make-identity user
+					      riece-server-name)
 			 (riece-make-identity (car targets)
 					      riece-server-name)
-			 message
-			 nil
-			 (riece-identity-equal
-			  speaker (riece-current-nickname))))))
+			 message nil
+			 (riece-identity-equal-no-server
+			  user riece-real-nickname)))))
 
 (defun riece-handle-notice-message (prefix string)
   (let* ((user (if prefix
@@ -90,7 +89,9 @@
 						  riece-server-name)
 			     (riece-make-identity (car targets)
 						  riece-server-name)
-			     message 'notice))
+			     message 'notice
+			     (riece-identity-equal-no-server
+			      user riece-real-nickname)))
       ;; message from server
       (riece-insert-notice
        (list riece-dialogue-buffer riece-others-buffer)