Don't decrypt self message.

[riece] / lisp / riece-naming.el

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index dd5ad10..cb0e5a9 100644 (file)
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -70,22 +70,24 @@
 (defun riece-naming-assert-channel-users (users channel-name)
   (let ((channel-identity (riece-make-identity channel-name
                                               riece-server-name))
-       user-identity-list)
-    (while users
-      (riece-user-toggle-channel (car (car users)) channel-name t)
-      (riece-channel-toggle-user channel-name (car (car users)) t)
-      (if (memq ?o (cdr (car users)))
-         (riece-channel-toggle-operator channel-name (car (car users)) t)
-       (if (memq ?v (cdr (car users)))
-           (riece-channel-toggle-speaker channel-name (car (car users)) t)
-         (riece-channel-toggle-operator channel-name (car (car users)) nil)
-         (riece-channel-toggle-speaker channel-name (car (car users)) nil)))
-      (setq user-identity-list
-           (cons (cons (riece-make-identity (car (car users))
-                                            riece-server-name)
-                       (cdr (car users)))
-                 user-identity-list)
-           users (cdr users)))
+       (pointer users))
+    (while pointer
+      (riece-user-toggle-channel (car (car pointer)) channel-name t)
+      (riece-channel-toggle-user channel-name (car (car pointer)) t)
+      (if (memq ?o (cdr (car pointer)))
+         (riece-channel-toggle-operator channel-name (car (car pointer)) t)
+       (if (memq ?v (cdr (car pointer)))
+           (riece-channel-toggle-speaker channel-name (car (car pointer)) t)
+         (riece-channel-toggle-operator channel-name (car (car pointer)) nil)
+         (riece-channel-toggle-speaker channel-name (car (car pointer)) nil)))
+      (setq pointer (cdr pointer)))
+    ;; Remove nonexistent users.
+    (setq pointer (riece-channel-users (riece-get-channel channel-name)))
+    (while pointer
+      (unless (assoc (car (car pointer)) users)
+       (riece-user-toggle-channel (car (car pointer)) channel-name nil)
+       (riece-channel-toggle-user channel-name (car (car pointer)) nil))
+      (setq pointer (cdr pointer)))
     (riece-emit-signal 'user-list-changed channel-identity)))
 
 (defun riece-naming-assert-channel-modes (channel modes)