X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-filter.el;h=89abe6fed80b4f7596d7dd0ebb8b31d6f905b99d;hp=c6eba7215116d58d6f9eef1e5a0707950b0bf736;hb=b3b111c08ece2cc499656fcb321bf25ad52f3d0d;hpb=4b29776da15420296d4042f9433aab1430fabca6

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index c6eba72..89abe6f 100644
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -27,6 +27,8 @@
 (require 'riece-handle)
 (require 'riece-misc)
 (require 'riece-server)			;riece-close-server
+(require 'riece-identity)
+(require 'riece-display)
 
 (defun riece-handle-numeric-reply (prefix number name string)
   (let ((base-number (* (/ number 100) 100))
@@ -123,34 +125,41 @@
 	(forward-line)))))
 
 (eval-when-compile
-  (autoload 'riece "riece"))
+  (autoload 'riece-exit "riece"))
 (defun riece-sentinel (process status)
   (if riece-reconnect-with-password
-      (unwind-protect
-	  (if (eq process riece-server-process)
-	      (riece)			;Need to initialize system.
-	    (let ((server-name
-		   (car (rassq process riece-server-process-alist))))
-	      (riece-close-server server-name)
-	      (riece-open-server
-	       (riece-server-name-to-server server-name)
-	       server-name)))
-	(setq riece-reconnect-with-password nil))
+      (let ((server-name
+	     (with-current-buffer (process-buffer process)
+	       riece-server-name)))
+	(riece-close-server-process process)
+	(riece-open-server
+	 (if (equal server-name "")
+	     riece-server
+	   (riece-server-name-to-server server-name))
+	 server-name))
     (let ((server-name (with-current-buffer (process-buffer process)
 			 riece-server-name)))
-      (if (and (process-id process)		;not a network connection
-	       (string-match "^exited abnormally with code \\([0-9]+\\)"
-			     status))
-	  (if server-name
-	      (message "Connection to \"%s\" closed: %s"
-		       server-name (match-string 1 status))
-	    (message "Connection closed: %s" (match-string 1 status)))
-	(if server-name
+      (if riece-debug
+	  (if (equal server-name "")
+	      (message "Connection closed: %s"
+		       (substring status 0 (1- (length status))))
 	    (message "Connection to \"%s\" closed: %s"
-		     server-name (substring status 0 (1- (length status))))
-	  (message "Connection closed: %s"
-		   (substring status 0 (1- (length status))))))
-      (riece-close-server server-name))))
+		     server-name (substring status 0 (1- (length status)))))
+	(if (equal server-name "")
+	    (message "Connection closed")
+	  (message "Connection to \"%s\" closed" server-name)))
+      (let ((channels riece-current-channels))
+	(while channels
+	  (if (and (car channels)
+		   (equal (riece-identity-server (car channels))
+			  server-name))
+	      (riece-part-channel (car channels)))
+	  (setq channels (cdr channels))))
+      (riece-redisplay-buffers)
+      (riece-close-server-process process)
+      ;; If no server process is available, exit.
+      (unless riece-process-list
+	(riece-exit)))))
 
 (provide 'riece-filter)