Rename `mime-raw-content-info' -> `mime-raw-entity-info'.

[elisp/semi.git] / mime-pgp.el

diff --git a/mime-pgp.el b/mime-pgp.el
index 026252d..b5d301c 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -103,12 +103,12 @@
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp")
+          '((type . application)(subtype . pgp)
             (method . mime-method-for-application/pgp)
             ))
 
 (set-atype 'mime-acting-condition
-          '((type . "text/x-pgp")
+          '((type . text)(subtype . x-pgp)
             (method . mime-method-for-application/pgp)
             ))
 
@@ -120,13 +120,13 @@
   "Internal method to check multipart/signed."
   (let* ((rcnum (reverse (mime-article/point-content-number beg)))
         (oinfo (mime-article/rcnum-to-cinfo (cons '1 rcnum)
-                                            mime-raw-content-info))
+                                            mime-raw-entity-info))
         )
     (mime-playback-entity oinfo (cdr (assq 'mode cal)))
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "multipart/signed")
+          '((type . multipart)(subtype . signed)
             (method . mime-method-to-verify-multipart/signed)
             ))
 
@@ -184,7 +184,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                 (1+ knum)))
         (raw-buf (current-buffer))
         (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
-                                            mime-raw-content-info))
+                                            mime-raw-entity-info))
         kbuf
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
@@ -251,7 +251,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       )))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp-signature")
+          '((type . application)(subtype . pgp-signature)
             (method . mime-method-to-verify-application/pgp-signature)
             ))
 
@@ -269,7 +269,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                   (1- knum)
                 (1+ knum)))
         (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
-                                            mime-raw-content-info))
+                                            mime-raw-entity-info))
         (obeg (mime-entity-info-point-min oinfo))
         (oend (mime-entity-info-point-max oinfo))
         )
@@ -277,7 +277,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp-encrypted")
+          '((type . application)(subtype . pgp-encrypted)
             (method . mime-method-to-decrypt-application/pgp-encrypted)
             ))
 
@@ -286,7 +286,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 ;;;
 ;;; It is based on RFC 2015.
 
-(defun mime-pgp-add-keys (beg end cal)
+(defun mime-method-to-add-application/pgp-keys (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (encoding (cdr (assq 'encoding cal)))
@@ -306,8 +306,8 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp-keys")
-            (method . mime-pgp-add-keys)
+          '((type . application)(subtype . pgp-keys)
+            (method . mime-method-to-add-application/pgp-keys)
             ))