X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-naming.el;h=5295b8d912db252be966b67b9a02acf2dec3a54f;hp=4c1a91f61097761e8ceef48295c857f848d6e569;hb=387fef96e9a1bb38b25c7e398b4a17bb9d931488;hpb=29fb78636f5d9ed5968b260567a9aac916f77673

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index 4c1a91f..5295b8d 100644
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -54,20 +54,12 @@
 	    riece-real-nickname new-name))
   (let* ((old (riece-get-user old-name))
 	 (channels (riece-user-channels old))
-	 users pointer)
+	 users user)
     (while channels
       (setq users (riece-channel-get-users (car channels))
-	    pointer (member old-name users))
-      (if pointer
-	  (setcar pointer new-name))
-      (setq users (riece-channel-get-operators (car channels))
-	    pointer (member old-name users))
-      (if pointer
-	  (setcar pointer new-name))
-      (setq users (riece-channel-get-speakers (car channels))
-	    pointer (member old-name users))
-      (if pointer
-	  (setcar pointer new-name))
+	    user (car (riece-identity-assoc old-name users t)))
+      (if user
+	  (setcar user new-name))
       (setq channels (cdr channels)))
     (riece-rename-user old-name new-name))
   ;; Rename the channel buffer.