* riece-display.el (riece-channel-buffer-create): Add new hook.

[riece] / lisp / riece-handle.el

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 05a2607..371c407 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-message)
 (require 'riece-channel)
@@ -107,7 +105,7 @@
     (while channels
       (riece-naming-assert-join user (car channels))
       ;;XXX
-      (if (scandinavian-equal-ignore-case user riece-real-nickname)
+      (if (riece-identity-equal-no-server user riece-real-nickname)
          (riece-switch-to-channel (riece-make-identity (car channels))))
       (let ((buffer (cdr (riece-identity-assoc
                          (riece-make-identity (car channels))
@@ -200,7 +198,7 @@
         (pointer channels)
         (message (car (riece-split-parameters string))))
     ;; If you are quitting, no need to cleanup.
-    (unless (scandinavian-equal-ignore-case user riece-real-nickname)
+    (unless (riece-identity-equal-no-server user riece-real-nickname)
       ;; You were talking with the user.
       (if (riece-identity-member (riece-make-identity user)
                                 riece-current-channels)