* riece-unread.el (riece-unread-update-channel-list-buffer):

[riece] / lisp / riece-naming.el

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index cde0032..6a59cd2 100644 (file)
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -36,13 +36,7 @@
       (let ((channel-identity (riece-make-identity channel-name
                                                   riece-server-name)))
        (riece-join-channel channel-identity)
       (let ((channel-identity (riece-make-identity channel-name
                                                   riece-server-name)))
        (riece-join-channel channel-identity)

-       (riece-switch-to-channel channel-identity))
-    (if (and riece-current-channel
-            (riece-identity-equal (riece-make-identity channel-name
-                                                       riece-server-name)
-                                  riece-current-channel))
-       (with-current-buffer riece-user-list-buffer
-         (setq riece-redisplay-buffer t)))))
+       (riece-switch-to-channel channel-identity))))

 
 (defun riece-naming-assert-part (user-name channel-name)
   (riece-user-toggle-channel user-name channel-name nil)
 
 (defun riece-naming-assert-part (user-name channel-name)
   (riece-user-toggle-channel user-name channel-name nil)


@@ -51,13 +45,7 @@
   (riece-channel-toggle-speaker channel-name user-name nil)
   (if (riece-identity-equal-no-server user-name riece-real-nickname)
       (riece-part-channel (riece-make-identity channel-name
   (riece-channel-toggle-speaker channel-name user-name nil)
   (if (riece-identity-equal-no-server user-name riece-real-nickname)
       (riece-part-channel (riece-make-identity channel-name

-                                              riece-server-name))
-    (if (and riece-current-channel
-            (riece-identity-equal (riece-make-identity channel-name
-                                                       riece-server-name)
-                                  riece-current-channel))
-       (with-current-buffer riece-user-list-buffer
-         (setq riece-redisplay-buffer t)))))
+                                              riece-server-name))))

 
 (defun riece-naming-assert-rename (old-name new-name)
   (if (riece-identity-equal-no-server old-name riece-real-nickname)
 
 (defun riece-naming-assert-rename (old-name new-name)
   (if (riece-identity-equal-no-server old-name riece-real-nickname)


@@ -79,12 +67,6 @@
            pointer (member old-name users))
       (if pointer
          (setcar pointer new-name))
            pointer (member old-name users))
       (if pointer
          (setcar pointer new-name))

-      (if (and riece-current-channel
-              (riece-identity-equal (riece-make-identity (car channels)
-                                                         riece-server-name)
-                                    riece-current-channel))
-         (with-current-buffer riece-user-list-buffer
-           (setq riece-redisplay-buffer t)))

       (setq channels (cdr channels)))
     (riece-rename-user old-name new-name)))
 
       (setq channels (cdr channels)))
     (riece-rename-user old-name new-name)))