X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-naming.el;h=6a59cd2a13100a5472a59eca802d056337b6df01;hp=51f80292536ac6d76b71930d5b7014f1f085244a;hb=decb18b4cddd1d9fc0a68c4fc4cd72f98a4fd838;hpb=4b29776da15420296d4042f9433aab1430fabca6

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index 51f8029..6a59cd2 100644
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -30,26 +30,22 @@
 (require 'riece-display)
 
 (defun riece-naming-assert-join (user-name channel-name)
-  (if (riece-identity-equal-no-server user-name riece-real-nickname)
-      (riece-join-channel channel-name))
   (riece-user-toggle-channel user-name channel-name t)
-  (riece-channel-toggle-user channel-name user-name t))
+  (riece-channel-toggle-user channel-name user-name t)
+  (if (riece-identity-equal-no-server user-name riece-real-nickname)
+      (let ((channel-identity (riece-make-identity channel-name
+						   riece-server-name)))
+	(riece-join-channel channel-identity)
+	(riece-switch-to-channel channel-identity))))
 
 (defun riece-naming-assert-part (user-name channel-name)
+  (riece-user-toggle-channel user-name channel-name nil)
+  (riece-channel-toggle-user channel-name user-name nil)
+  (riece-channel-toggle-operator channel-name user-name nil)
+  (riece-channel-toggle-speaker channel-name user-name nil)
   (if (riece-identity-equal-no-server user-name riece-real-nickname)
-      (progn
-	(riece-part-channel channel-name)
-	(riece-forget-channel channel-name))
-    (riece-user-toggle-channel user-name channel-name nil)
-    (riece-channel-toggle-user channel-name user-name nil)
-    (riece-channel-toggle-operator channel-name user-name nil)
-    (riece-channel-toggle-speaker channel-name user-name nil)
-    (if (riece-identity-equal-safe user-name (riece-current-nickname))
-	(let* ((identity (riece-make-identity channel-name))
-	       (pointer (riece-identity-member-safe
-			 identity riece-current-channels)))
-	  (if pointer
-	      (setcar pointer nil))))))
+      (riece-part-channel (riece-make-identity channel-name
+					       riece-server-name))))
 
 (defun riece-naming-assert-rename (old-name new-name)
   (if (riece-identity-equal-no-server old-name riece-real-nickname)
@@ -75,3 +71,5 @@
     (riece-rename-user old-name new-name)))
 
 (provide 'riece-naming)
+
+;;; riece-naming.el ends here