From: kaoru <kaoru>
Date: Fri, 23 Jan 2004 23:12:57 +0000 (+0000)
Subject: * riece-handle.el (riece-handle-privmsg-message): Check own
X-Git-Tag: riece-0_1_8~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=73dde748df9b088fccaf1e88310b42a426322905;p=elisp%2Friece.git

* riece-handle.el (riece-handle-privmsg-message): Check own
message from server. For deal with another client that connected
same irc proxy (e.g. plum, pirc).
(riece-handle-notice-message): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5fa05ae..2f4fef9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
 	* riece-handle.el (riece-handle-privmsg-message): Check own
 	message from server. For deal with another client that connected
 	same irc proxy (e.g. plum, pirc).
+	(riece-handle-notice-message): Ditto.
 
 2004-01-21  Daiki Ueno  <ueno@unixuser.org>
 
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)