From: ueno <ueno>
Date: Sun, 7 Mar 2004 23:39:19 +0000 (+0000)
Subject: * riece-ctcp.el (riece-handle-ctcp-version-request): Fixed bug in
X-Git-Tag: riece-0_2_0
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=603330f54bf0185405dbc70a241cfc6c43105d43;p=elisp%2Friece.git

* riece-ctcp.el (riece-handle-ctcp-version-request): Fixed bug in
formatting target identity.
(riece-handle-ctcp-ping-request): Ditto.
(riece-handle-ctcp-clientinfo-request): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdced87..676476b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,11 @@
 	* Riece: Version 0.2.0 released.
 	* riece-version.el (riece-version-number): Bump up to 0.2.0.
 
+	* riece-ctcp.el (riece-handle-ctcp-version-request): Fixed bug in
+	formatting target identity.
+	(riece-handle-ctcp-ping-request): Ditto.
+	(riece-handle-ctcp-clientinfo-request): Ditto.
+
 2004-03-07  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-display.el: Rename some signals.
diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 37061bc..8f19673 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -109,10 +109,10 @@
 	    t)))))
 
 (defun riece-handle-ctcp-version-request (prefix target string)
-  (let ((buffer (if (riece-channel-p target)
-		    (riece-channel-buffer (riece-make-identity
-					   target riece-server-name))))
-	(user (riece-prefix-nickname prefix)))
+  (let* ((target-identity (riece-make-identity target riece-server-name))
+	 (buffer (if (riece-channel-p target)
+		     (riece-channel-buffer target-identity)))
+	 (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1VERSION %s\1\r\n" user (riece-extended-version)))
     (riece-insert-change buffer (format "CTCP VERSION from %s\n" user))
@@ -126,14 +126,14 @@
        (format "CTCP VERSION from %s (%s) to %s"
 	       user
 	       (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
-	       (riece-format-identity target t)))
+	       (riece-format-identity target-identity t)))
       "\n"))))
 
 (defun riece-handle-ctcp-ping-request (prefix target string)
-  (let ((buffer (if (riece-channel-p target)
-		    (riece-channel-buffer (riece-make-identity
-					   target riece-server-name))))
-	(user (riece-prefix-nickname prefix)))
+  (let* ((target-identity (riece-make-identity target riece-server-name))
+	 (buffer (if (riece-channel-p target)
+		     (riece-channel-buffer target-identity)))
+	 (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (if string
 	 (format "NOTICE %s :\1PING %s\1\r\n" user string)
@@ -149,14 +149,14 @@
        (format "CTCP PING from %s (%s) to %s"
 	       user
 	       (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
-	       (riece-format-identity target t)))
+	       (riece-format-identity target-identity t)))
       "\n"))))
 
 (defun riece-handle-ctcp-clientinfo-request (prefix target string)
-  (let ((buffer (if (riece-channel-p target)
-		    (riece-channel-buffer (riece-make-identity
-					   target riece-server-name))))
-	(user (riece-prefix-nickname prefix)))
+  (let* ((target-identity (riece-make-identity target riece-server-name))
+	 (buffer (if (riece-channel-p target)
+		     (riece-channel-buffer target-identity)))
+	 (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1CLIENTINFO %s\1\r\n"
 	     user
@@ -185,7 +185,7 @@
        (format "CTCP CLIENTINFO from %s (%s) to %s"
 	       user
 	       (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
-	       (riece-format-identity target t)))
+	       (riece-format-identity target-identity t)))
       "\n"))))
 
 (defun riece-handle-ctcp-action-request (prefix target string)