* elmo-util.el (elmo-file-field-primitive-condition-match): Fixed
[elisp/wanderlust.git] / elmo / elmo-pop3.el
index 7b29818..29ad744 100644 (file)
 (eval-and-compile
   (autoload 'md5 "md5"))
 
-;; POP3
-(defcustom elmo-pop3-default-user (or (getenv "USER")
-                                     (getenv "LOGNAME")
-                                     (user-login-name))
-  "*Default username for POP3."
-  :type 'string
-  :group 'elmo)
-
-(defcustom elmo-pop3-default-server  "localhost"
-  "*Default POP3 server."
-  :type 'string
-  :group 'elmo)
-
-(defcustom elmo-pop3-default-authenticate-type 'user
-  "*Default Authentication type for POP3."
-  :type 'symbol
-  :group 'elmo)
-
-(defcustom elmo-pop3-default-port 110
-  "*Default POP3 port."
-  :type 'integer
-  :group 'elmo)
-
-(defcustom elmo-pop3-default-stream-type nil
-  "*Default stream type for POP3.
-Any symbol value of `elmo-network-stream-type-alist' or
-`elmo-pop3-stream-type-alist'."
-  :type 'symbol
-  :group 'elmo)
-
-(defcustom elmo-pop3-default-use-uidl t
-  "If non-nil, use UIDL on POP3."
-  :type 'boolean
-  :group 'elmo)
-
-(elmo-define-obsolete-variable 'elmo-default-pop3-server
-                              'elmo-pop3-default-server)
-(elmo-define-obsolete-variable 'elmo-default-pop3-user
-                              'elmo-pop3-default-user)
-(elmo-define-obsolete-variable 'elmo-default-pop3-authenticate-type
-                              'elmo-pop3-default-authenticate-type)
-(elmo-define-obsolete-variable 'elmo-default-pop3-port
-                              'elmo-pop3-default-port)
-
-(defvar elmo-pop3-stream-type-alist nil
-  "*Stream bindings for POP3.
-This is taken precedence over `elmo-network-stream-type-alist'.")
-
-(defvar elmo-pop3-use-uidl-internal t
-  "(Internal switch for using UIDL on POP3).")
-
-(defvar elmo-pop3-use-cache t
-  "Use cache in pop3 folder.")
-
-(defvar elmo-pop3-send-command-synchronously nil
-  "If non-nil, commands are send synchronously.
-If server doesn't accept asynchronous commands, this variable should be
-set as non-nil.")
-
 (defvar elmo-pop3-exists-exactly t)
 (defvar sasl-mechanism-alist)
 
-;;; ELMO POP3 folder
-(eval-and-compile
-  (luna-define-class elmo-pop3-folder (elmo-net-folder)
-                    (use-uidl location-alist))
-  (luna-define-internal-accessors 'elmo-pop3-folder))
-
-(luna-define-method elmo-folder-initialize :around ((folder
-                                                    elmo-pop3-folder)
-                                                   name)
-  (let ((elmo-network-stream-type-alist
-        (if elmo-pop3-stream-type-alist
-            (append elmo-pop3-stream-type-alist
-                    elmo-network-stream-type-alist)
-          elmo-network-stream-type-alist)))
-    (setq name (luna-call-next-method))
-    ;; Setup slots for elmo-net-folder
-    (when (string-match "^\\([^:/!]*\\)\\(/[^/:@!]+\\)?\\(:[^/:@!]+\\)?" name)
-      (elmo-net-folder-set-user-internal folder
-                                        (if (match-beginning 1)
-                                            (elmo-match-string 1 name)))
-      (if (eq (length (elmo-net-folder-user-internal folder)) 0)
-         (elmo-net-folder-set-user-internal folder
-                                            elmo-pop3-default-user))
-      (elmo-net-folder-set-auth-internal
-       folder
-       (if (match-beginning 2)
-          (intern (elmo-match-substring 2 name 1))
-        elmo-pop3-default-authenticate-type))
-      (elmo-pop3-folder-set-use-uidl-internal
-       folder
-       (if (match-beginning 3)
-          (string= (elmo-match-substring 3 name 1) "uidl")
-        elmo-pop3-default-use-uidl)))
-    (unless (elmo-net-folder-server-internal folder)
-      (elmo-net-folder-set-server-internal folder 
-                                          elmo-pop3-default-server))
-    (unless (elmo-net-folder-port-internal folder)
-      (elmo-net-folder-set-port-internal folder
-                                        elmo-pop3-default-port))
-    (unless (elmo-net-folder-stream-type-internal folder)
-      (elmo-net-folder-set-stream-type-internal
-       folder
-       elmo-pop3-default-stream-type))
-    folder))
-
-;;; POP3 session
-(luna-define-class elmo-pop3-session (elmo-network-session) ())
+(defvar elmo-pop3-total-size nil)
+
+;; For debugging.
+(defvar elmo-pop3-debug nil
+  "Non-nil forces POP3 folder as debug mode.
+Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
+
+(defvar elmo-pop3-debug-inhibit-logging nil)
+
+;;; Debug
+(defsubst elmo-pop3-debug (message &rest args)
+  (if elmo-pop3-debug
+      (with-current-buffer (get-buffer-create "*POP3 DEBUG*")
+       (goto-char (point-max))
+       (if elmo-pop3-debug-inhibit-logging
+           (insert "NO LOGGING\n")
+         (insert (apply 'format message args) "\n")))))
+
+(luna-define-class elmo-pop3-session (elmo-network-session))
 
 ;; buffer-local
 (defvar elmo-pop3-read-point nil)
@@ -170,25 +83,25 @@ set as non-nil.")
     (when (memq (process-status
                 (elmo-network-session-process-internal session))
                '(open run))
-      (let ((buffer (process-buffer 
-                    (elmo-network-session-process-internal session))))
-       (elmo-pop3-send-command (elmo-network-session-process-internal session)
-                               "quit")
-       ;; process is dead.
-       (or (elmo-pop3-read-response
-            (elmo-network-session-process-internal session)
-            t buffer)
-           (error "POP error: QUIT failed"))))
+      (elmo-pop3-send-command (elmo-network-session-process-internal session)
+                             "quit")
+      (or (elmo-pop3-read-response
+          (elmo-network-session-process-internal session) t)
+         (error "POP error: QUIT failed")))
     (kill-buffer (process-buffer
                  (elmo-network-session-process-internal session)))
     (delete-process (elmo-network-session-process-internal session))))
 
-(defun elmo-pop3-get-session (folder &optional if-exists)
-  (let ((elmo-pop3-use-uidl-internal (if elmo-inhibit-number-mapping
-                                        nil
-                                      (elmo-pop3-folder-use-uidl-internal
-                                       folder))))
-    (elmo-network-get-session 'elmo-pop3-session "POP3" folder if-exists)))
+(defun elmo-pop3-get-session (spec &optional if-exists)
+  (elmo-network-get-session
+   'elmo-pop3-session
+   "POP3"
+   (elmo-pop3-spec-hostname spec)
+   (elmo-pop3-spec-port spec)
+   (elmo-pop3-spec-username spec)
+   (elmo-pop3-spec-auth spec)
+   (elmo-pop3-spec-stream-type spec)
+   if-exists))
 
 (defun elmo-pop3-send-command (process command &optional no-erase)
   (with-current-buffer (process-buffer process)
@@ -196,12 +109,12 @@ set as non-nil.")
       (erase-buffer))
     (goto-char (point-min))
     (setq elmo-pop3-read-point (point))
+    (elmo-pop3-debug "SEND: %s\n" command)
     (process-send-string process command)
     (process-send-string process "\r\n")))
 
-(defun elmo-pop3-read-response (process &optional not-command buffer)
-  ;; buffer is in case for process is dead.
-  (with-current-buffer (or buffer (process-buffer process))
+(defun elmo-pop3-read-response (process &optional not-command)
+  (with-current-buffer (process-buffer process)
     (let ((case-fold-search nil)
          (response-string nil)
          (response-continue t)
@@ -243,7 +156,11 @@ set as non-nil.")
   (save-excursion
     (set-buffer (process-buffer process))
     (goto-char (point-max))
-    (insert output)))
+    (insert output)
+    (elmo-pop3-debug "RECEIVED: %s\n" output)
+    (if elmo-pop3-total-size
+       (message "Retrieving...(%d/%d bytes)." 
+                (buffer-size) elmo-pop3-total-size))))
 
 (defun elmo-pop3-auth-user (session)
   (let ((process (elmo-network-session-process-internal session)))
@@ -324,6 +241,7 @@ set as non-nil.")
   (with-current-buffer (process-buffer 
                        (elmo-network-session-process-internal session))
     (let* ((process (elmo-network-session-process-internal session))
+          (elmo-pop3-debug-inhibit-logging t)
           (auth (elmo-network-session-auth-internal session))
           (auth (mapcar '(lambda (mechanism) (upcase (symbol-name mechanism)))
                         (if (listp auth) auth (list auth))))
@@ -345,7 +263,7 @@ set as non-nil.")
                   mechanism
                   (elmo-network-session-user-internal session)
                   "pop"
-                  (elmo-network-session-server-internal session)))
+                  (elmo-network-session-host-internal session)))
 ;;;        (if elmo-pop3-auth-user-realm
 ;;;            (sasl-client-set-property client 'realm elmo-pop3-auth-user-realm))
            (setq name (sasl-mechanism-name mechanism))
@@ -411,7 +329,7 @@ set as non-nil.")
       ;; POP server always returns a sequence of serial numbers.
       (setq count (elmo-pop3-parse-list-response response))
       ;; UIDL
-      (when elmo-pop3-use-uidl-internal
+      (when elmo-pop3-use-uidl
        (setq elmo-pop3-uidl-number-hash (elmo-make-hash (* count 2)))
        (setq elmo-pop3-number-uidl-hash (elmo-make-hash (* count 2)))
        ;; UIDL
@@ -424,8 +342,7 @@ set as non-nil.")
        (elmo-pop3-parse-uidl-response response)))))
 
 (defun elmo-pop3-read-contents (buffer process)
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (let ((case-fold-search nil)
          match-end)
       (goto-char elmo-pop3-read-point)
@@ -437,24 +354,21 @@ set as non-nil.")
        (buffer-substring elmo-pop3-read-point
                         (- match-end 3))))))
 
-(luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-pop3-folder))
-  (convert-standard-filename
-   (expand-file-name
-    (elmo-safe-filename (elmo-net-folder-user-internal folder))
-    (expand-file-name (elmo-net-folder-server-internal folder)
-                     (expand-file-name
-                      "pop"
-                      elmo-msgdb-dir)))))
+;; dummy functions
+(defun elmo-pop3-list-folders (spec &optional hierarchy) nil)
+(defun elmo-pop3-append-msg (spec string) nil nil)
+(defun elmo-pop3-folder-creatable-p (spec) nil)
+(defun elmo-pop3-create-folder (spec) nil)
 
-(luna-define-method elmo-folder-exists-p ((folder elmo-pop3-folder))
+(defun elmo-pop3-folder-exists-p (spec)
   (if (and elmo-pop3-exists-exactly
-          (elmo-folder-plugged-p folder))
+          (elmo-pop3-plugged-p spec))
       (save-excursion
-       (let (elmo-auto-change-plugged  ; don't change plug status.
-             (elmo-inhibit-number-mapping t) ; No need to use uidl.
+       (let (elmo-auto-change-plugged ; don't change plug status.
+             elmo-pop3-use-uidl       ; No need to use uidl.
              session)
          (prog1
-             (setq session (elmo-pop3-get-session folder))
+             (setq session (elmo-pop3-get-session spec))
            (if session
                (elmo-network-close-session session)))))
     t))
@@ -466,7 +380,7 @@ set as non-nil.")
       (let (number uid list)
        (insert string)
        (goto-char (point-min))
-       (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([^ \n]+\\)$" nil t)
+       (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([^ \n]+\\)$" nil t)
          (setq number  (elmo-match-buffer 1))
          (setq uid (elmo-match-buffer 2))
          (with-current-buffer buffer
@@ -484,7 +398,7 @@ set as non-nil.")
     (with-temp-buffer
       (insert string)
       (goto-char (point-min))
-      (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([0-9]+\\)$" nil t)
+      (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([0-9]+\\)$" nil t)
        (setq alist
              (cons
               (cons (elmo-match-buffer 1)
@@ -501,10 +415,10 @@ set as non-nil.")
        (setq elmo-pop3-list-done t))
       count)))
 
-(defun elmo-pop3-list-location (folder)
+(defun elmo-pop3-list-location (spec)
   (with-current-buffer (process-buffer
                        (elmo-network-session-process-internal
-                        (elmo-pop3-get-session folder)))
+                        (elmo-pop3-get-session spec)))
     (let (list)
       (if elmo-pop3-uidl-done
          (progn
@@ -515,46 +429,18 @@ set as non-nil.")
            (nreverse list))
        (error "POP3: Error in UIDL")))))
 
-(defun elmo-pop3-list-folder-by-location (folder locations)
-  (let* ((location-alist (elmo-pop3-folder-location-alist-internal folder))
-        (locations-in-db (mapcar 'cdr location-alist))
-        result new-locs new-alist deleted-locs i)
-    (setq new-locs
-         (elmo-delete-if (function
-                          (lambda (x) (member x locations-in-db)))
-                         locations))
-    (setq deleted-locs
-         (elmo-delete-if (function
-                          (lambda (x) (member x locations)))
-                         locations-in-db))
-    (setq i (or (elmo-max-of-list (mapcar 'car location-alist)) 0))
-    (mapcar
-     (function
-      (lambda (x)
-       (setq location-alist
-             (delq (rassoc x location-alist) location-alist))))
-     deleted-locs)
-    (while new-locs
-      (setq i (1+ i))
-      (setq new-alist (cons (cons i (car new-locs)) new-alist))
-      (setq new-locs (cdr new-locs)))
-    (setq result (nconc location-alist new-alist))
-    (setq result (sort result (lambda (x y) (< (car x)(car y)))))
-    (elmo-pop3-folder-set-location-alist-internal folder result)
-    (mapcar 'car result)))
-
-(defun elmo-pop3-list-by-uidl-subr (folder &optional nonsort)
-  (let ((flist (elmo-pop3-list-folder-by-location
-               folder
-               (elmo-pop3-list-location folder))))
+(defun elmo-pop3-list-by-uidl-subr (spec &optional nonsort)
+  (let ((flist (elmo-list-folder-by-location
+               spec
+               (elmo-pop3-list-location spec))))
     (if nonsort
        (cons (elmo-max-of-list flist) (length flist))
       (sort flist '<))))
 
-(defun elmo-pop3-list-by-list (folder)
+(defun elmo-pop3-list-by-list (spec)
   (with-current-buffer (process-buffer
                        (elmo-network-session-process-internal
-                        (elmo-pop3-get-session folder)))
+                        (elmo-pop3-get-session spec)))
     (let (list)
       (if elmo-pop3-list-done
          (progn
@@ -566,23 +452,27 @@ set as non-nil.")
            (sort list '<))
        (error "POP3: Error in list")))))
 
-(defsubst elmo-pop3-folder-list-messages (folder)
-  (if (and (not elmo-inhibit-number-mapping)
-          (elmo-pop3-folder-use-uidl-internal folder))
-      (elmo-pop3-list-by-uidl-subr folder)
-    (elmo-pop3-list-by-list folder)))
-
-(luna-define-method elmo-folder-list-messages-internal
-  ((folder elmo-pop3-folder) &optional nohide)
-  (elmo-pop3-folder-list-messages folder))
-
-(luna-define-method elmo-folder-status ((folder elmo-pop3-folder))
-  (elmo-folder-check folder)
-  (if (elmo-pop3-folder-use-uidl-internal folder)
-      (elmo-pop3-list-by-uidl-subr folder 'nonsort)
+(defun elmo-pop3-list-folder (spec &optional nohide)
+  (let ((killed (and elmo-use-killed-list
+                    (elmo-msgdb-killed-list-load
+                     (elmo-msgdb-expand-path spec))))
+       numbers)
+    (elmo-pop3-commit spec)
+    (setq numbers (if elmo-pop3-use-uidl
+                     (progn
+                       (elmo-pop3-list-by-uidl-subr spec))
+                   (elmo-pop3-list-by-list spec)))
+    (elmo-living-messages numbers killed)))
+
+(defun elmo-pop3-max-of-folder (spec)
+  (elmo-pop3-commit spec)
+  (if elmo-pop3-use-uidl
+      (prog1
+         (elmo-pop3-list-by-uidl-subr spec 'nonsort)
+       (elmo-pop3-commit spec))
     (let* ((process
            (elmo-network-session-process-internal
-            (elmo-pop3-get-session folder)))
+            (elmo-pop3-get-session spec)))
           (total 0)
           response)
       (with-current-buffer (process-buffer process)
@@ -594,6 +484,7 @@ set as non-nil.")
          (setq total
                (string-to-int
                 (substring response (match-beginning 1)(match-end 1 ))))
+         (elmo-pop3-commit spec)
          (cons total total))))))
 
 (defvar elmo-pop3-header-fetch-chop-length 200)
@@ -610,7 +501,7 @@ set as non-nil.")
       nil))
    (t
     nil)))
-     
+
 (defun elmo-pop3-retrieve-headers (buffer tobuffer process articles)
   (save-excursion
     (set-buffer buffer)
@@ -657,22 +548,7 @@ set as non-nil.")
        (replace-match "\n"))
       (copy-to-buffer tobuffer (point-min) (point-max)))))
 
-(luna-define-method elmo-folder-msgdb-create ((folder elmo-pop3-folder)
-                                             numlist new-mark
-                                             already-mark seen-mark
-                                             important-mark seen-list)
-  (let ((process (elmo-network-session-process-internal
-                 (elmo-pop3-get-session folder))))
-    (with-current-buffer (process-buffer process)
-      (elmo-pop3-sort-msgdb-by-original-number
-       folder
-       (elmo-pop3-msgdb-create-by-header
-       process
-       numlist
-       new-mark already-mark
-       seen-mark seen-list
-       (if (elmo-pop3-folder-use-uidl-internal folder)
-           (elmo-pop3-folder-location-alist-internal folder)))))))
+(defalias 'elmo-pop3-msgdb-create 'elmo-pop3-msgdb-create-as-numlist)
 
 (defun elmo-pop3-sort-overview-by-original-number (overview loc-alist)
   (if loc-alist
@@ -686,15 +562,33 @@ set as non-nil.")
                             loc-alist))))))
     overview))
 
-(defun elmo-pop3-sort-msgdb-by-original-number (folder msgdb)
+(defun elmo-pop3-sort-msgdb-by-original-number (msgdb)
   (message "Sorting...")
   (let ((overview (elmo-msgdb-get-overview msgdb)))
-    (current-buffer)
     (setq overview (elmo-pop3-sort-overview-by-original-number
                    overview
-                   (elmo-pop3-folder-location-alist-internal folder)))
+                   (elmo-msgdb-get-location msgdb)))
     (message "Sorting...done")
-    (list overview (nth 1 msgdb)(nth 2 msgdb)(nth 3 msgdb))))
+    (list overview (nth 1 msgdb)(nth 2 msgdb)(nth 3 msgdb)(nth 4 msgdb))))
+
+(defun elmo-pop3-msgdb-create-as-numlist (spec numlist new-mark
+                                              already-mark seen-mark
+                                              important-mark seen-list
+                                              &optional msgdb)
+  (when numlist
+    (let ((process (elmo-network-session-process-internal
+                   (elmo-pop3-get-session spec)))
+         loc-alist)
+      (if elmo-pop3-use-uidl
+         (setq loc-alist (if msgdb (elmo-msgdb-get-location msgdb)
+                           (elmo-msgdb-location-load
+                            (elmo-msgdb-expand-path spec)))))
+      (with-current-buffer (process-buffer process)
+       (elmo-pop3-sort-msgdb-by-original-number
+        (elmo-pop3-msgdb-create-by-header process numlist
+                                          new-mark already-mark
+                                          seen-mark seen-list
+                                          loc-alist))))))
 
 (defun elmo-pop3-uidl-to-number (uidl)
   (string-to-number (elmo-get-hash-val uidl
@@ -785,8 +679,8 @@ set as non-nil.")
              (setq message-id (car entity))
              (setq seen (member message-id seen-list))
              (if (setq gmark (or (elmo-msgdb-global-mark-get message-id)
-                                 (if (elmo-file-cache-status
-                                      (elmo-file-cache-get message-id))
+                                 (if (elmo-cache-exists-p
+                                      message-id) ; XXX
                                      (if seen
                                          nil
                                        already-mark)
@@ -805,7 +699,7 @@ set as non-nil.")
              (elmo-display-progress
               'elmo-pop3-msgdb-create-message "Creating msgdb..."
               (/ (* i 100) num)))))
-      (list overview number-alist mark-alist))))
+      (list overview number-alist mark-alist loc-alist))))
 
 (defun elmo-pop3-read-body (process outbuf)
   (with-current-buffer (process-buffer process)
@@ -818,42 +712,45 @@ set as non-nil.")
       (setq end (point))
       (with-current-buffer outbuf
        (erase-buffer)
-       (insert-buffer-substring (process-buffer process) start (- end 3))))))
-
-(luna-define-method elmo-folder-open-internal ((folder elmo-pop3-folder))
-  (if (elmo-pop3-folder-use-uidl-internal folder)
-      (elmo-pop3-folder-set-location-alist-internal
-       folder (elmo-msgdb-location-load (elmo-folder-msgdb-path folder)))))
-
-(luna-define-method elmo-folder-commit :after ((folder elmo-pop3-folder))
-  (when (elmo-folder-persistent-p folder)
-    (elmo-msgdb-location-save (elmo-folder-msgdb-path folder)
-                             (elmo-pop3-folder-location-alist-internal
-                              folder))))
-
-(luna-define-method elmo-folder-close-internal ((folder elmo-pop3-folder))
-  (elmo-pop3-folder-set-location-alist-internal folder nil)
-  (elmo-folder-check folder))
-
-(luna-define-method elmo-message-fetch-plugged ((folder elmo-pop3-folder)
-                                               number strategy
-                                               &optional section
-                                               outbuf unseen)
-  (let* ((loc-alist (elmo-pop3-folder-location-alist-internal folder))
+       (insert-buffer-substring (process-buffer process) start (- end 3))
+       (elmo-delete-cr-get-content-type)))))
+
+(defun elmo-pop3-read-msg (spec number outbuf &optional msgdb unread)
+  (let* ((loc-alist (if elmo-pop3-use-uidl
+                       (if msgdb
+                           (elmo-msgdb-get-location msgdb)
+                         (elmo-msgdb-location-load
+                          (elmo-msgdb-expand-path spec)))))
         (process (elmo-network-session-process-internal
-                  (elmo-pop3-get-session folder)))
-        response errmsg msg)
+                  (elmo-pop3-get-session spec)))
+        size response errmsg msg)
     (with-current-buffer (process-buffer process)
       (if loc-alist
          (setq number (elmo-pop3-uidl-to-number
                        (cdr (assq number loc-alist)))))
+      (setq size (string-to-number
+                 (elmo-pop3-number-to-size number)))
       (when number
        (elmo-pop3-send-command process
                                (format "retr %s" number))
-       (when (null (setq response (elmo-pop3-read-response
-                                   process t)))
-         (error "Fetching message failed"))
-       (setq response (elmo-pop3-read-body process outbuf))
+       (setq elmo-pop3-total-size size)
+       (unless elmo-inhibit-display-retrieval-progress
+         (setq elmo-pop3-total-size size)
+         (elmo-display-progress
+          'elmo-pop3-display-retrieval-progress
+          (format "Retrieving (0/%d bytes)..." elmo-pop3-total-size)
+          0))
+       (unwind-protect
+           (progn
+             (when (null (setq response (elmo-pop3-read-response
+                                         process t)))
+               (error "Fetching message failed"))
+             (setq response (elmo-pop3-read-body process outbuf)))
+         (setq elmo-pop3-total-size nil))
+       (unless elmo-inhibit-display-retrieval-progress
+         (elmo-display-progress
+          'elmo-display-retrieval-progress "" 100)  ; remove progress bar.
+         (message "Retrieving...done."))
        (set-buffer outbuf)
        (goto-char (point-min))
        (while (re-search-forward "^\\." nil t)
@@ -876,28 +773,61 @@ set as non-nil.")
              (error "Deleting message failed")))
        (error "Deleting message failed")))))
 
-(luna-define-method elmo-folder-delete-messages ((folder elmo-pop3-folder)
-                                                     msgs)
-  (let ((loc-alist (elmo-pop3-folder-location-alist-internal folder))
+(defun elmo-pop3-delete-msgs (spec msgs &optional msgdb)
+  (let ((loc-alist (if elmo-pop3-use-uidl
+                      (if msgdb
+                          (elmo-msgdb-get-location msgdb)
+                        (elmo-msgdb-location-load
+                         (elmo-msgdb-expand-path spec)))))
        (process (elmo-network-session-process-internal
-                 (elmo-pop3-get-session folder))))
+                 (elmo-pop3-get-session spec))))
     (mapcar '(lambda (msg) (elmo-pop3-delete-msg
                            process msg loc-alist))
            msgs)))
 
-(luna-define-method elmo-message-use-cache-p ((folder elmo-pop3-folder) number)
-  elmo-pop3-use-cache)
-
-(luna-define-method elmo-folder-persistent-p ((folder elmo-pop3-folder))
-  (and (elmo-folder-persistent-internal folder)
-       (elmo-pop3-folder-use-uidl-internal folder)))
+(defun elmo-pop3-search (spec condition &optional numlist)
+  (error "Searching in pop3 folder is not implemented yet"))
 
+(defun elmo-pop3-use-cache-p (spec number)
+  elmo-pop3-use-cache)
 
-(luna-define-method elmo-folder-check ((folder elmo-pop3-folder))
-  (if (elmo-folder-plugged-p folder)
-      (let ((session (elmo-pop3-get-session folder 'if-exists)))
-       (and session
-            (elmo-network-close-session session)))))
+(defun elmo-pop3-local-file-p (spec number)
+  nil)
+
+(defun elmo-pop3-port-label (spec)
+  (concat "pop3"
+         (if (elmo-pop3-spec-stream-type spec)
+             (concat "!" (symbol-name
+                          (elmo-network-stream-type-symbol
+                           (elmo-pop3-spec-stream-type spec)))))))
+
+(defsubst elmo-pop3-portinfo (spec)
+  (list (elmo-pop3-spec-hostname spec)
+       (elmo-pop3-spec-port spec)))
+
+(defun elmo-pop3-plugged-p (spec)
+  (apply 'elmo-plugged-p
+        (append (elmo-pop3-portinfo spec)
+                (list nil (quote (elmo-pop3-port-label spec))))))
+
+(defun elmo-pop3-set-plugged (spec plugged add)
+  (apply 'elmo-set-plugged plugged
+        (append (elmo-pop3-portinfo spec)
+                (list nil nil (quote (elmo-pop3-port-label spec)) add))))
+
+(defalias 'elmo-pop3-sync-number-alist
+  'elmo-generic-sync-number-alist)
+(defalias 'elmo-pop3-list-folder-unread
+  'elmo-generic-list-folder-unread)
+(defalias 'elmo-pop3-list-folder-important
+  'elmo-generic-list-folder-important)
+(defalias 'elmo-pop3-folder-diff 'elmo-generic-folder-diff)
+
+(defun elmo-pop3-commit (spec)
+  (if (elmo-pop3-plugged-p spec)
+      (let ((session (elmo-pop3-get-session spec 'if-exists)))
+       (when session
+         (elmo-network-close-session session)))))
 
 (require 'product)
 (product-provide (provide 'elmo-pop3) (require 'elmo-version))