diff lisp/gnus/nnkiboze.el @ 91085:880960b70474

Merge from emacs--devo--0 Revision: [e-mail]/emacs--unicode--0--patch-283

--- a/lisp/gnus/nnkiboze.el	Fri Nov 09 14:52:32 2007 +0000
+++ b/lisp/gnus/nnkiboze.el	Sun Nov 11 00:56:44 2007 +0000
@@ -227,7 +227,7 @@
 			  "." gnus-score-file-suffix))))))
 
 (defun nnkiboze-generate-group (group &optional inhibit-list-groups)
-  (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
+  (let* ((info (gnus-get-info group))
 	 (newsrc-file (concat nnkiboze-directory
 			      (nnheader-translate-file-chars
 			       (concat group ".newsrc"))))
@@ -269,8 +269,7 @@
 		  (numberp (car (symbol-value group))) ; It is active
 		  (or (> nnkiboze-level 7)
 		      (and (setq glevel
-				 (nth 1 (nth 2 (gnus-gethash
-						gname gnus-newsrc-hashtb))))
+				 (gnus-info-level (gnus-get-info gname)))
 			   (>= nnkiboze-level glevel)))
 		  (not (string-match "^nnkiboze:" gname)) ; Exclude kibozes
 		  (push (cons gname (1- (car (symbol-value group))))
@@ -282,8 +281,7 @@
 	  ;; number that has been kibozed in GROUP in this kiboze group.
 	  (setq newsrc nnkiboze-newsrc)
 	  (while newsrc
-	    (if (not (setq active (gnus-gethash
-				   (caar newsrc) gnus-active-hashtb)))
+	    (if (not (setq active (gnus-active (caar newsrc))))
 		;; This group isn't active after all, so we remove it from
 		;; the list of component groups.
 		(setq nnkiboze-newsrc (delq (car newsrc) nnkiboze-newsrc))
@@ -294,8 +292,7 @@
 	      (gnus-message 3 "nnkiboze: Checking %s..." (caar newsrc))
 	      (setq ginfo (gnus-get-info (gnus-group-group-name))
 		    orig-info (gnus-copy-sequence ginfo)
-		    num-unread (car (gnus-gethash (caar newsrc)
-						  gnus-newsrc-hashtb)))
+		    num-unread (gnus-group-unread (caar newsrc)))
 	      (unwind-protect
 		  (progn
 		    ;; We set all list of article marks to nil.  Since we operate
@@ -338,8 +335,7 @@
 		;; Restore the proper info.
 		(when ginfo
 		  (setcdr ginfo (cdr orig-info)))
-		(setcar (gnus-gethash (caar newsrc) gnus-newsrc-hashtb)
-			num-unread)))
+		(setcar (gnus-group-entry (caar newsrc)) num-unread)))
 	    (setcdr (car newsrc) (cdr active))
 	    (gnus-message 3 "nnkiboze: Checking %s...done" (caar newsrc))
 	    (setq newsrc (cdr newsrc)))))