* elmo-net.el (elmo-network-get-session): Set stream-type argument

for `elmo-plugged-p'.
(elmo-open-network-stream): Fixed stream-type argument.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 71b5980..460e137 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-26  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-net.el (elmo-network-get-session): Set stream-type argument
+       for `elmo-plugged-p'.
+       (elmo-open-network-stream): Fixed stream-type argument.
+
 2001-07-25  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-archive.el (elmo-archive-get-archive-name): Cause an error when

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index bde1207..3bb72c2 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -158,7 +158,9 @@ if making session failed, returns nil."
   (let (pair session key)
     (if (not (elmo-plugged-p
              (elmo-net-folder-server-internal folder)
-             (elmo-net-folder-port-internal folder)))
+             (elmo-net-folder-port-internal folder)
+             (elmo-network-stream-type-symbol
+              (elmo-net-folder-stream-type-internal folder))))
        (error "Unplugged"))
     (setq pair (assoc (setq key (elmo-network-session-cache-key name folder))
                      elmo-network-session-cache))
@@ -255,14 +257,17 @@ Returns a process object.  if making session failed, returns nil."
                   (open-network-stream name buffer server service)))))
       (error
        (when auto-plugged
-        (elmo-set-plugged nil server service stream-type (current-time))
+        (elmo-set-plugged nil server service
+                          (elmo-network-stream-type-symbol stream-type)
+                          (current-time))
         (message "Auto plugged off at %s:%d" server service)
         (sit-for 1))
        (signal (car err) (cdr err))))
     (when process
       (process-kill-without-query process)
       (when auto-plugged
-       (elmo-set-plugged t server service stream-type))
+       (elmo-set-plugged t server service
+                         (elmo-network-stream-type-symbol stream-type)))
       process)))
 
 (defun elmo-get-network-stream-type (symbol)