[Emacs-diffs] Changes to emacs/lisp/gnus/nnkiboze.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/28 09:18:40

Index: lisp/gnus/nnkiboze.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnkiboze.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- lisp/gnus/nnkiboze.el       26 Jul 2007 05:27:03 -0000      1.17
+++ lisp/gnus/nnkiboze.el       28 Oct 2007 09:18:33 -0000      1.18
@@ -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)))))