* riece-globals.el (riece-obarray-size, riece-obarray): Abolish.

[riece] / lisp / riece-misc.el

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 2e2a912..bc1e2c9 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -223,11 +223,17 @@
   (riece-with-server-buffer server-name
     (let (identities)
       (mapatoms
-       (lambda (atom)
+       (lambda (channel)
         (setq identities
-              (cons (riece-make-identity (symbol-name atom) server-name)
+              (cons (riece-make-identity (symbol-name channel) server-name)
                     identities)))
-       riece-obarray)
+       riece-channel-obarray)
+      (mapatoms
+       (lambda (user)
+        (setq identities
+              (cons (riece-make-identity (symbol-name user) server-name)
+                    identities)))
+       riece-user-obarray)
       identities)))
 
 (defun riece-check-channel-commands-are-usable (&optional channel)