* riece-unread.el (riece-guess-channel-from-unread): Return

[riece] / lisp / riece-handle.el

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 628d356..cf5e0be 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -161,7 +161,6 @@
         (message (nth 1 parameters))
         (user-identity (riece-make-identity user riece-server-name)))
     (while channels
-      (riece-naming-assert-part user (car channels))
       (let* ((channel-identity (riece-make-identity (car channels)
                                                    riece-server-name))
             (buffer (riece-channel-buffer channel-identity)))
@@ -187,6 +186,7 @@
                    (riece-format-identity channel-identity t))
            message))
          "\n")))
+      (riece-naming-assert-part user (car channels))
       (setq channels (cdr channels)))))
 
 (defun riece-handle-kick-message (prefix string)
@@ -234,7 +234,7 @@
         (user-identity (riece-make-identity user riece-server-name)))
     ;; If you are talking with the user, quit it.
     (if (riece-identity-member user-identity riece-current-channels)
-       (riece-part-channel user))
+       (riece-part-channel user-identity))
     (setq pointer channels)
     (while pointer
       (riece-naming-assert-part user (car pointer))