(mml-smime-sign-query, mml-smime-get-dns-cert):

Don't depend on Gnus by using mail-extract-address-components if
gnus-extract-address-components is not bound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3613bc4..d2d5fe8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mml-smime.el (mml-smime-sign-query, mml-smime-get-dns-cert):
+       Don't depend on Gnus by using mail-extract-address-components if
+       gnus-extract-address-components is not bound.
+
 2005-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-art.el (gnus-mime-display-security): Don't display the

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 894abe7..e9dd6dc 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -79,7 +79,10 @@
   (list 'keyfile
        (if (= (length smime-keys) 1)
            (cadar smime-keys)
-         (or (let ((from (cadr (funcall gnus-extract-address-components
+         (or (let ((from (cadr (funcall (if (boundp
+                                             'gnus-extract-address-components)
+                                            gnus-extract-address-components
+                                          'mail-extract-address-components)
                                         (or (save-excursion
                                               (save-restriction
                                                 (message-narrow-to-headers)
@@ -105,7 +108,10 @@
        (while (not result)
          (setq who (read-from-minibuffer
                     (format "%sLookup certificate for: " (or bad ""))
-                    (cadr (funcall gnus-extract-address-components
+                    (cadr (funcall (if (boundp
+                                        'gnus-extract-address-components)
+                                       gnus-extract-address-components
+                                     'mail-extract-address-components)
                                    (or (save-excursion
                                          (save-restriction
                                            (message-narrow-to-headers)