projects / elisp / wanderlust.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* wl-vars.el (wl-folder-sync-range-alist): Set default range for
[elisp/wanderlust.git] / elmo / elmo-net.el
diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index 1b824fe..9ec6022 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -385,9 +385,7 @@ Returned value is searched from `elmo-network-stream-type-alist'."
         (elmo-delete-if
          (lambda (number) (memq number deleting))
          ;; current number-list.
-         (mapcar
-          'car
-          (elmo-msgdb-get-number-alist (elmo-folder-msgdb folder))))
+         (elmo-msgdb-list-messages (elmo-folder-msgdb folder)))
         ;; append appending messages
         (mapcar (lambda (x) (* -1 x))
                 (elmo-dop-spool-folder-list-messages folder))))
@@ -404,11 +402,7 @@ Returned value is searched from `elmo-network-stream-type-alist'."
                                                          elmo-net-folder))
   (if (and (elmo-folder-plugged-p folder)
           (elmo-folder-use-flag-p folder))
-      (elmo-uniq-list
-       (nconc
-       (elmo-folder-send folder 'elmo-folder-list-importants-plugged)
-       (elmo-folder-list-messages-with-global-mark
-        folder elmo-msgdb-important-mark)))
+      (elmo-folder-send folder 'elmo-folder-list-importants-plugged)
     (luna-call-next-method)))
 
 (luna-define-method elmo-folder-list-answereds :around ((folder
@@ -442,107 +436,119 @@ Returned value is searched from `elmo-network-stream-type-alist'."
   (elmo-folder-delete-messages-dop folder numbers))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-net-folder)
-                                             numbers seen-list)
+                                             numbers flag-table)
   (if (elmo-folder-plugged-p folder)
       (elmo-folder-send folder 'elmo-folder-msgdb-create-plugged
-                       numbers seen-list)
+                       numbers flag-table)
     (elmo-folder-send folder 'elmo-folder-msgdb-create-unplugged
-                     numbers seen-list)))
+                     numbers flag-table)))
 
 (luna-define-method elmo-folder-msgdb-create-unplugged ((folder
                                                         elmo-net-folder)
                                                        numbers
-                                                       seen-list)
+                                                       flag-table)
   ;; XXXX should be appended to already existing msgdb.
   (elmo-dop-msgdb
    (elmo-folder-msgdb-create (elmo-dop-spool-folder folder)
                             (mapcar 'abs numbers)
-                            seen-list)))
-
-(luna-define-method elmo-folder-unmark-important ((folder elmo-net-folder)
-                                                 numbers)
-  (if (elmo-folder-use-flag-p folder)
-      (if (elmo-folder-plugged-p folder)
-         (elmo-folder-send folder 'elmo-folder-unmark-important-plugged
-                           numbers)
-       (elmo-folder-send folder
-                         'elmo-folder-unmark-important-unplugged numbers))
-    t))
-
-(luna-define-method elmo-folder-mark-as-important ((folder elmo-net-folder)
-                                                  numbers)
-  (if (elmo-folder-use-flag-p folder)
-      (if (elmo-folder-plugged-p folder)
-         (elmo-folder-send folder 'elmo-folder-mark-as-important-plugged
-                           numbers)
-       (elmo-folder-send folder 'elmo-folder-mark-as-important-unplugged
-                         numbers))
-    t))
-
-(luna-define-method elmo-folder-unmark-read ((folder elmo-net-folder)
-                                            numbers)
-  (if (elmo-folder-use-flag-p folder)
-      (if (elmo-folder-plugged-p folder)
-         (elmo-folder-send folder 'elmo-folder-unmark-read-plugged numbers)
-       (elmo-folder-send folder 'elmo-folder-unmark-read-unplugged numbers))
-    t))
-
-(luna-define-method elmo-folder-mark-as-read ((folder elmo-net-folder)
-                                             numbers)
-  (if (elmo-folder-use-flag-p folder)
-      (if (elmo-folder-plugged-p folder)
-         (elmo-folder-send folder 'elmo-folder-mark-as-read-plugged numbers)
-       (elmo-folder-send
-        folder 'elmo-folder-mark-as-read-unplugged numbers))
-    t))
+                            flag-table)))
 
-(luna-define-method elmo-folder-unmark-answered ((folder elmo-net-folder)
-                                                numbers)
-  (if (elmo-folder-use-flag-p folder)
-      (if (elmo-folder-plugged-p folder)
-         (elmo-folder-send folder 'elmo-folder-unmark-answered-plugged
-                           numbers)
-       (elmo-folder-send folder
-                         'elmo-folder-unmark-answered-unplugged numbers))
-    (luna-call-next-method)))
-
-(luna-define-method elmo-folder-mark-as-answered ((folder elmo-net-folder)
-                                                 numbers)
-  (if (elmo-folder-use-flag-p folder)
-      (if (elmo-folder-plugged-p folder)
-         (elmo-folder-send folder 'elmo-folder-mark-as-answered-plugged
-                           numbers)
-       (elmo-folder-send folder 'elmo-folder-mark-as-answered-unplugged
-                         numbers))
-    (luna-call-next-method)))
-
-(luna-define-method elmo-folder-mark-as-read-unplugged ((folder
+(luna-define-method elmo-folder-unflag-important :before ((folder
+                                                          elmo-net-folder)
+                                                         numbers
+                                                         &optional
+                                                         is-local)
+  (when (and (elmo-folder-use-flag-p folder)
+            (not is-local))
+    (if (elmo-folder-plugged-p folder)
+       (elmo-folder-send folder 'elmo-folder-unflag-important-plugged
+                         numbers)
+      (elmo-folder-send folder
+                       'elmo-folder-unflag-important-unplugged numbers))))
+
+(luna-define-method elmo-folder-flag-as-important :before ((folder
+                                                           elmo-net-folder)
+                                                          numbers
+                                                          &optional
+                                                          is-local)
+  (when (and (elmo-folder-use-flag-p folder)
+            (not is-local))
+    (if (elmo-folder-plugged-p folder)
+       (elmo-folder-send folder 'elmo-folder-flag-as-important-plugged
+                         numbers)
+      (elmo-folder-send folder 'elmo-folder-flag-as-important-unplugged
+                       numbers))))
+
+(luna-define-method elmo-folder-unflag-read :before ((folder elmo-net-folder)
+                                                    numbers
+                                                    &optional is-local)
+  (when (and (elmo-folder-use-flag-p folder)
+            (not is-local))
+    (if (elmo-folder-plugged-p folder)
+       (elmo-folder-send folder 'elmo-folder-unflag-read-plugged numbers)
+      (elmo-folder-send folder 'elmo-folder-unflag-read-unplugged numbers))))
+
+(luna-define-method elmo-folder-flag-as-read :before ((folder elmo-net-folder)
+                                                     numbers
+                                                     &optional is-local)
+  (when (and (elmo-folder-use-flag-p folder)
+            (not is-local))
+    (if (elmo-folder-plugged-p folder)
+       (elmo-folder-send folder 'elmo-folder-flag-as-read-plugged numbers)
+      (elmo-folder-send
+       folder 'elmo-folder-flag-as-read-unplugged numbers))))
+
+(luna-define-method elmo-folder-unflag-answered :before ((folder
+                                                         elmo-net-folder)
+                                                        numbers
+                                                        &optional is-local)
+  (when (and (elmo-folder-use-flag-p folder)
+            (not is-local))
+    (if (elmo-folder-plugged-p folder)
+       (elmo-folder-send folder 'elmo-folder-unflag-answered-plugged
+                         numbers)
+      (elmo-folder-send folder
+                       'elmo-folder-unflag-answered-unplugged numbers))))
+
+(luna-define-method elmo-folder-flag-as-answered :before ((folder
+                                                          elmo-net-folder)
+                                                         numbers
+                                                         &optional is-local)
+  (when (and (elmo-folder-use-flag-p folder)
+            (not is-local))
+    (if (elmo-folder-plugged-p folder)
+       (elmo-folder-send folder 'elmo-folder-flag-as-answered-plugged
+                         numbers)
+      (elmo-folder-send folder 'elmo-folder-flag-as-answered-unplugged
+                       numbers))))
+
+(luna-define-method elmo-folder-flag-as-read-unplugged ((folder
                                                         elmo-net-folder)
                                                        numbers)
-  (elmo-folder-mark-as-read-dop folder numbers))
+  (elmo-folder-flag-as-read-dop folder numbers))
 
-(luna-define-method elmo-folder-unmark-read-unplugged ((folder elmo-net-folder)
+(luna-define-method elmo-folder-unflag-read-unplugged ((folder elmo-net-folder)
                                                     numbers)
-  (elmo-folder-unmark-read-dop folder numbers))
+  (elmo-folder-unflag-read-dop folder numbers))
 
-(luna-define-method elmo-folder-mark-as-important-unplugged ((folder
+(luna-define-method elmo-folder-flag-as-important-unplugged ((folder
                                                              elmo-net-folder)
                                                             numbers)
-  (elmo-folder-mark-as-important-dop folder numbers))
+  (elmo-folder-flag-as-important-dop folder numbers))
 
-(luna-define-method elmo-folder-unmark-important-unplugged ((folder
+(luna-define-method elmo-folder-unflag-important-unplugged ((folder
                                                             elmo-net-folder)
                                                            numbers)
-  (elmo-folder-unmark-important-dop folder numbers))
+  (elmo-folder-unflag-important-dop folder numbers))
 
-(luna-define-method elmo-folder-mark-as-answered-unplugged ((folder
+(luna-define-method elmo-folder-flag-as-answered-unplugged ((folder
                                                             elmo-net-folder)
                                                            numbers)
-  (elmo-folder-mark-as-answered-dop folder numbers))
+  (elmo-folder-flag-as-answered-dop folder numbers))
 
-(luna-define-method elmo-folder-unmark-answered-unplugged
+(luna-define-method elmo-folder-unflag-answered-unplugged
   ((folder elmo-net-folder) numbers)
-  (elmo-folder-unmark-answered-dop folder numbers))
+  (elmo-folder-unflag-answered-dop folder numbers))
 
 (luna-define-method elmo-message-encache :around ((folder elmo-net-folder)
                                                  number &optional read)
@@ -594,8 +600,7 @@ Returned value is searched from `elmo-network-stream-type-alist'."
   (if (elmo-folder-plugged-p folder)
       (elmo-folder-send folder 'elmo-folder-check-plugged)))
 
-(luna-define-method elmo-folder-diff :around ((folder elmo-net-folder)
-                                             &optional numbers)
+(luna-define-method elmo-folder-diff :around ((folder elmo-net-folder))
   (if (and (elmo-folder-use-flag-p folder)
           (elmo-folder-plugged-p folder))
       (elmo-folder-send folder 'elmo-folder-diff-plugged)