X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-naming.el;h=6a59cd2a13100a5472a59eca802d056337b6df01;hp=afd7f7e7fe785db61c9e76f68095715b35c75002;hb=87bb5cd7d0d72f50f2bcbd442f8eea5286afd0fa;hpb=57d046780969b7e65645f16ed42e178b43b8e206

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index afd7f7e..6a59cd2 100644
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -24,37 +24,31 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 (require 'riece-channel)
 (require 'riece-user)
 (require 'riece-display)
 
 (defun riece-naming-assert-join (user-name channel-name)
-  (if (scandinavian-equal-ignore-case 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)
-  (if (scandinavian-equal-ignore-case 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-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)
+      (riece-part-channel (riece-make-identity channel-name
+					       riece-server-name))))
 
 (defun riece-naming-assert-rename (old-name new-name)
-  (if (scandinavian-equal-ignore-case old-name riece-real-nickname)
+  (if (riece-identity-equal-no-server old-name riece-real-nickname)
       (setq riece-last-nickname riece-real-nickname
 	    riece-real-nickname new-name))
   (let* ((old (riece-get-user old-name))
@@ -77,3 +71,5 @@
     (riece-rename-user old-name new-name)))
 
 (provide 'riece-naming)
+
+;;; riece-naming.el ends here