X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ndcc.el;h=a5a9ae8a8d92c9f42983ae1d835145d0c58ab6a2;hb=b0496990ebe94bac4c320b6696ee62957ee9d3a1;hp=74b637526cafedfbe3402b0cb8b882b9e89f3846;hpb=57d046780969b7e65645f16ed42e178b43b8e206;p=riece

diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el
index 74b6375..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
@@ -71,7 +75,6 @@ Only used for sending files."
 	       (substring (process-name process) 0 (match-beginning 0)))))
       (save-excursion
 	(set-buffer (process-buffer (get-process parent-name)))
-	(delete-process parent-name)
 	(goto-char (point-min))
 	(while (not (eobp))
 	  (process-send-region process
@@ -80,9 +83,9 @@ Only used for sending files."
 	  (message "Sending %s...(%d/%d)"
 		   (buffer-file-name) (1- (point)) (buffer-size)))
 	(message "Sending %s...done"
-		 (buffer-file-name))))
-    (kill-buffer (process-buffer process))
-    (delete-process process)))
+		 (buffer-file-name)))
+      (kill-buffer (process-buffer (get-process parent-name))))
+    (kill-buffer (process-buffer process))))
 
 (defun riece-command-dcc-send (user file)
   (interactive
@@ -170,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)
@@ -192,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)