From: Teodor Zlatanov <tzz@lifelogs.com>
Date: Mon, 16 Oct 2006 18:34:54 +0000 (+0000)
Subject: (spam-check-BBDB, spam-enter-ham-BBDB, spam-parse-list): use
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=3d85d98a62f648aad4e5509d3a9741091142030d

(spam-check-BBDB, spam-enter-ham-BBDB, spam-parse-list): use
ietf-drums-parse-address instead of gnus-extract-address-components.
Reported by Damien Elmes <damien@repose.cx>.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb8fe208a..49a516f33 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-16  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-check-BBDB, spam-enter-ham-BBDB, spam-parse-list): use
+	ietf-drums-parse-address instead of gnus-extract-address-components.
+	Reported by Damien Elmes <damien@repose.cx>.
+
 2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
 	* mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
diff --git a/lisp/spam.el b/lisp/spam.el
index ff2227b51..26c0f5b9f 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -43,6 +43,7 @@
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'spam-report))
 (eval-when-compile (require 'hashcash))
+(eval-when-compile (require 'ietf-drums))
 
 (require 'gnus-sum)
 
@@ -2080,12 +2081,12 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
       "Enter an address into the BBDB; implies ham (non-spam) sender"
       (dolist (from addresses)
 	(when (stringp from)
-	  (let* ((parsed-address (gnus-extract-address-components from))
-		 (name (or (nth 0 parsed-address) "Ham Sender"))
+	  (let* ((parsed-address (ietf-drums-parse-address from))
+		 (name (or (nth 1 parsed-address) "Ham Sender"))
 		 (remove-function (if remove
 				      'bbdb-delete-record-internal
 				    'ignore))
-		 (net-address (nth 1 parsed-address))
+		 (net-address (nth 0 parsed-address))
 		 (record (and net-address
 			      (bbdb-search-simple nil net-address))))
 	    (when net-address
@@ -2129,7 +2130,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 		   bbdb-hashtable))))
 	    (puthash 'spam-use-BBDB bbdb-cache spam-caches)))
 	(when who
-	  (setq who (nth 1 (gnus-extract-address-components who)))
+	  (setq who (car (ietf-drums-parse-address who)))
 	  (if
 	      (if spam-cache-lookups
 		  (intern-soft (downcase who) bbdb-cache)
@@ -2379,7 +2380,7 @@ REMOVE not nil, remove the ADDRESSES."
 	  (forward-line 1)
 	  ;; insert the e-mail address if detected, otherwise the raw data
 	  (unless (zerop (length address))
-	    (let ((pure-address (nth 1 (gnus-extract-address-components address))))
+	    (let ((pure-address (car (ietf-drums-parse-address address))))
 	      (push (or pure-address address) contents)))))
       (nreverse contents))))