X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ndcc.el;h=3dd90d62b32fe3aafef97eb823e9a9d62698f625;hb=7dc3769d16aa275005c9c8b10fb1006017f9ef16;hp=a5ba60846840f6c0efef35d6f8bd3a3f66d51fc1;hpb=d3e5f6ce6488690c232e5d2e8208517b251c6f4b;p=riece

diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el
index a5ba608..3dd90d6 100644
--- a/lisp/riece-ndcc.el
+++ b/lisp/riece-ndcc.el
@@ -23,6 +23,9 @@
 
 ;;; Code:
 
+(require 'riece-globals)
+(require 'riece-options)
+
 (require 'calc)
 
 (defgroup riece-ndcc nil
@@ -41,6 +44,11 @@ Only used for sending files."
 (defvar riece-ndcc-request-user nil)
 (defvar riece-ndcc-request-size nil)
 
+(defvar riece-ndcc-enabled nil)
+
+(defconst riece-ndcc-description
+  "DCC file sending extension implemented with `make-network-process'")
+
 (defun riece-ndcc-encode-address (address)
   (unless (string-match
 	   "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$"
@@ -71,7 +79,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,18 +87,18 @@ 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
    (let ((completion-ignore-case t))
      (unless riece-ndcc-server-address
        (error "Set riece-ndcc-server-address to your host"))
-     (list (completing-read
+     (list (riece-completing-read-identity
 	    "User: "
-	    (mapcar #'list (riece-get-users-on-server)))
+	    (riece-get-users-on-server (riece-current-server-name)))
 	   (expand-file-name (read-file-name "File: ")))))
   (let* (selective-display
 	 (coding-system-for-read 'binary)
@@ -108,7 +115,8 @@ Only used for sending files."
 					:sentinel 'riece-ndcc-server-sentinel))
     (riece-send-string
      (format "PRIVMSG %s :\1DCC SEND %s %s %d %d\1\r\n"
-	     user (file-name-nondirectory file)
+	     (riece-identity-prefix user)
+	     (file-name-nondirectory file)
 	     (riece-ndcc-encode-address riece-ndcc-server-address)
 	     (nth 1 (process-contact process))
 	     (nth 7 (file-attributes file))))))
@@ -170,7 +178,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)
@@ -184,17 +192,17 @@ Only used for sending files."
 
 (defun riece-handle-dcc-request (prefix target message)
   (let ((case-fold-search t))
-    (when (string-match
-	   "SEND \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\)"
-	   message)
+    (when (and riece-ndcc-enabled
+	       (string-match
+		"SEND \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\)"
+		message))
       (let ((file (match-string 1 message))
 	    (address (match-string 2 message))
 	    (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-no-server
-			      (riece-make-identity target)
-			      riece-channel-buffer-alist))))
+			(riece-channel-buffer (riece-make-identity
+					       target riece-server-name))))
 	    (user (riece-prefix-nickname prefix)))
 	(setq riece-ndcc-requests
 	      (cons (list user file address port size)
@@ -220,10 +228,16 @@ Only used for sending files."
 
 (defvar riece-dialogue-mode-map)
 (defun riece-ndcc-insinuate ()
-  (add-hook 'riece-ctcp-dcc-request-hook 'riece-handle-dcc-request)
+  (add-hook 'riece-ctcp-dcc-request-hook 'riece-handle-dcc-request))
+
+(defun riece-ndcc-enable ()
   (define-key riece-dialogue-mode-map "\C-ds" 'riece-command-dcc-send)
   (define-key riece-dialogue-mode-map "\C-dr" 'riece-command-dcc-receive))
 
+(defun riece-ndcc-disable ()
+  (define-key riece-dialogue-mode-map "\C-ds" nil)
+  (define-key riece-dialogue-mode-map "\C-dr" nil))
+
 (provide 'riece-ndcc)
 
 ;;; riece-ndcc.el ends here