(mime-verify-application/pgp-signature): Don't use

`mime-raw-find-entity-from-node-id'.
(mime-decrypt-application/pgp-encrypted): Likewise.

diff --git a/mime-pgp.el b/mime-pgp.el
index 90aad3a..fe2e1f2 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -160,13 +160,12 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
         (end (mime-entity-point-max entity))
         (encoding (cdr (assq 'encoding situation)))
         (entity-node-id (mime-raw-point-to-entity-node-id start))
-        (mother-node-id (cdr entity-node-id))
+        (mother (mime-entity-parent entity))
         (knum (car entity-node-id))
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
-        (orig-entity (mime-raw-find-entity-from-node-id
-                      (cons onum mother-node-id) mime-message-structure))
+        (orig-entity (nth onum (mime-entity-children mother)))
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
         (sig-file (concat orig-file ".sig"))
@@ -220,13 +219,12 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 
 (defun mime-decrypt-application/pgp-encrypted (entity situation)
   (let* ((entity-node-id (mime-entity-node-id entity))
-        (mother-node-id (cdr entity-node-id))
+        (mother (mime-entity-parent entity))
         (knum (car entity-node-id))
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
-        (orig-entity (mime-raw-find-entity-from-node-id
-                      (cons onum mother-node-id) mime-message-structure)))
+        (orig-entity (nth onum (mime-entity-children mother))))
     (mime-view-application/pgp orig-entity situation)
     ))