X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-ctcp.el;h=78a4dae655acff63c4892c72ea54f15ffe4d7526;hp=1110ca2c60465594cdc1b7990a5c4da24782d89b;hb=005a2a7642c9f43d699922799801124a77d56f5d;hpb=c0e0df415ff962f9b1e7b979b37e8efec074a8fb

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 1110ca2..78a4dae 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -83,9 +83,8 @@
 
 (defun riece-handle-ctcp-version-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-		    (cdr (riece-identity-assoc
-			  (riece-make-identity target)
-			  riece-channel-buffer-alist))))
+		    (riece-channel-buffer-name
+		     (riece-make-identity target riece-server-name))))
 	(user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1VERSION %s\1\r\n" user (riece-extended-version)))
@@ -105,9 +104,8 @@
 
 (defun riece-handle-ctcp-ping-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-		    (cdr (riece-identity-assoc
-			  (riece-make-identity target)
-			  riece-channel-buffer-alist))))
+		    (riece-channel-buffer-name
+		     (riece-make-identity target riece-server-name))))
 	(user (riece-prefix-nickname prefix)))
     (riece-send-string
      (if string
@@ -129,9 +127,8 @@
 
 (defun riece-handle-ctcp-clientinfo-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-		    (cdr (riece-identity-assoc
-			  (riece-make-identity target)
-			  riece-channel-buffer-alist))))
+		    (riece-channel-buffer-name
+		     (riece-make-identity target riece-server-name))))
 	(user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1CLIENTINFO %s\1\r\n"
@@ -166,9 +163,8 @@
 
 (defun riece-handle-ctcp-action-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-		    (cdr (riece-identity-assoc
-			  (riece-make-identity target)
-			  riece-channel-buffer-alist))))
+		    (riece-channel-buffer-name
+		     (riece-make-identity target riece-server-name))))
 	(user (riece-prefix-nickname prefix)))
     (riece-insert-change buffer (concat user " " string "\n"))
     (riece-insert-change
@@ -292,9 +288,8 @@
   (riece-send-string (format "PRIVMSG %s :\1ACTION %s\1\r\n"
 			     (riece-identity-prefix channel)
 			     action))
-  (let ((buffer (cdr (riece-identity-assoc
-		      (riece-make-identity channel)
-		      riece-channel-buffer-alist))))
+  (let ((buffer (riece-channel-buffer-name
+		 (riece-make-identity channel riece-server-name))))
     (riece-insert-change
      buffer
      (concat (riece-identity-prefix (riece-current-nickname)) " " action "\n"))