X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ndcc.el;h=a5a9ae8a8d92c9f42983ae1d835145d0c58ab6a2;hb=b9d6ae0d8aa0c6459bf6cccb8604ce4ff31bf66b;hp=78a73d7a6f495a9d6cd5182629e3763693e4dc36;hpb=8ccc6545c3dc171176fd4f04779116ccd4ed1e82;p=riece

diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el
index 78a73d7..a5a9ae8 100644
--- a/lisp/riece-ndcc.el
+++ b/lisp/riece-ndcc.el
@@ -23,6 +23,10 @@
 
 ;;; Code:
 
+(require 'riece-globals)
+(require 'riece-options)
+(require 'riece-display)
+
 (require 'calc)
 
 (defgroup riece-ndcc nil
@@ -81,7 +85,7 @@ Only used for sending files."
 	(message "Sending %s...done"
 		 (buffer-file-name)))
       (kill-buffer (process-buffer (get-process parent-name))))
-    (kill-buffer (process-buffer process))
+    (kill-buffer (process-buffer process))))
 
 (defun riece-command-dcc-send (user file)
   (interactive
@@ -169,7 +173,7 @@ Only used for sending files."
 		   "DCC" " *DCC*"
 		   (riece-ndcc-decode-address (nth 2 request))
 		   (nth 3 request))))
-    (setq riece-rdcc-requests (delq request riece-rdcc-requests))
+    (setq riece-ndcc-requests (delq request riece-ndcc-requests))
     (with-current-buffer (process-buffer process)
       (set-buffer-multibyte nil)
       (buffer-disable-undo)
@@ -191,9 +195,8 @@ Only used for sending files."
 	    (port (string-to-number (match-string 3 message)))
 	    (size (string-to-number (match-string 4 message)))
 	    (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)))
 	(setq riece-ndcc-requests
 	      (cons (list user file address port size)