X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-server.el;h=2b18ba15461a81e9cdc3e2a23a536c43cee974ae;hb=c694c12685b03816d35bc0a35b0202ddaeb56118;hp=756598b055495d309643c1b443e6fc77e21a5731;hpb=107d20094003503fbc588b00e239c490f17d5c67;p=riece

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 756598b..2b18ba1 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -62,22 +62,6 @@ the `riece-server-keyword-map' variable."
 (put 'riece-server-keyword-bind 'lisp-indent-function 1)
 (put 'riece-server-keyword-bind 'edebug-form-spec '(form body))
 
-(defun riece-clear-system ()
-  (while riece-buffer-list
-    (if (and (get-buffer (car riece-buffer-list))
-	     (buffer-live-p (car riece-buffer-list)))
-	(funcall riece-buffer-dispose-function (car riece-buffer-list)))
-    (setq riece-buffer-list (cdr riece-buffer-list)))
-  (setq riece-current-channels nil
-	riece-current-channel nil
-	riece-user-indicator nil
-	riece-channel-indicator "None"
-	riece-channel-list-indicator "No channel"
-	riece-away-indicator "-"
-	riece-operator-indicator "-"
-	riece-freeze-indicator "-")
-  (delete-other-windows))
-
 (defun riece-server-parse-string (string)
   "Convert a STRING set as `riece-server' and return a property list."
   (when (or (string-match "^\\[\\([^]]+\\)\\]:?\\([0-9]*\\)" string)
@@ -141,29 +125,36 @@ the `riece-server-keyword-map' variable."
     (riece-process-send-string process string)))
 
 (defun riece-open-server (server server-name)
-  (if (equal server-name "")
-      (message "Connecting to IRC server...")
-    (message "Connecting to %s..." server-name))
   (riece-server-keyword-bind server
-    (let* (selective-display
-	   (coding-system-for-read 'binary)
-	   (coding-system-for-write 'binary)
-	   (process
+    (let (selective-display
+	  (coding-system-for-read 'binary)
+	  (coding-system-for-write 'binary)
+	  process)
+      (if (equal server-name "")
+	  (message "Connecting to IRC server...")
+	(message "Connecting to %s..." server-name))
+      (setq process
 	    (funcall function (riece-server-process-name server-name)
 		     (concat " *IRC*" server-name)
-		     host service)))
+		     host service))
+      (if (equal server-name "")
+	  (message "Connecting to IRC server...done")
+	(message "Connecting to %s...done" server-name))
       (riece-reset-process-buffer process)
       (with-current-buffer (process-buffer process)
 	(setq riece-server-name server-name))
       (set-process-sentinel process 'riece-sentinel)
       (set-process-filter process 'riece-filter)
-      (if (or password
-	      riece-reconnect-with-password)
+      (if (equal server-name "")
+	  (message "Logging in to IRC server...")
+	(message "Logging in to %s..." server-name))
+      (if riece-reconnect-with-password	;password incorrect or not set.
+	  (unwind-protect
+	      (setq password (riece-read-passwd "Password: "))
+	    (setq riece-reconnect-with-password nil)))
+      (if password
 	  (riece-process-send-string process
-				     (format "PASS %s\r\n"
-					     (or password
-						 (riece-read-passwd
-						  "Password: ")))))
+				     (format "PASS %s\r\n" password)))
       (riece-process-send-string process
 				 (format "USER %s * * :%s\r\n"
 					 (user-real-login-name)
@@ -175,10 +166,7 @@ the `riece-server-keyword-map' variable."
 	      riece-nick-accepted 'sent
 	      riece-coding-system coding))
       (setq riece-process-list
-	    (cons process riece-process-list))))
-  (if (equal server-name "")
-      (message "Connecting to IRC server...done")
-    (message "Connecting to %s...done" server-name)))
+	    (cons process riece-process-list)))))
 
 (defun riece-reset-process-buffer (process)
   (save-excursion
@@ -219,11 +207,16 @@ the `riece-server-keyword-map' variable."
 	    (throw 'found t))
 	(setq process-list (cdr process-list))))))
 
+(eval-when-compile
+  (autoload 'riece-exit "riece"))
 (defun riece-quit-server-process (process &optional message)
   (run-at-time riece-quit-timeout nil
 	       (lambda (process)
-		 (if (memq process riece-process-list)
-		     (kill-process (process-buffer process))))
+		 (when (memq process riece-process-list)
+		   (riece-close-server-process process)
+		   ;; If no server process is available, exit.
+		   (unless riece-process-list
+		     (riece-exit))))
 	       process)
   (riece-process-send-string process
 			     (if message