X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-000.el;h=12e2d37d9e9612a59bbe9cae43c9779294ac3877;hb=57212160b168042980a1d2d3636485c5af1280d9;hp=2f7c71321492e74df6e242e83f7b51fe096962f3;hpb=e3919f8e320115aa694c9738174ea15f059008be;p=riece

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index 2f7c713..12e2d37 100644
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -27,6 +27,7 @@
 (require 'riece-misc)
 (require 'riece-filter)			;riece-default-handle-message
 (require 'riece-version)
+(require 'riece-commands)		;riece-command-join
 
 (eval-when-compile
   (autoload 'riece-default-handle-numeric-reply "riece-filter"))
@@ -42,6 +43,9 @@
   (setq riece-real-server-name prefix
 	riece-real-nickname name
 	riece-real-userhost nil)
+  ;; Before sending USERHOST, register myself with riece-obarray
+  ;; because it may take some time.
+  (riece-get-user name)
   (riece-send-string (format "USERHOST %s\r\n" riece-real-nickname))
   (riece-insert-info
    (list riece-dialogue-buffer riece-others-buffer)
@@ -52,9 +56,9 @@
   (let ((channel-list riece-startup-channel-list))
     (while channel-list
       (if (listp (car channel-list))
-	  (riece-command-join (car (car channel-list))
+	  (riece-command-join (riece-parse-identity (car (car channel-list)))
 			      (nth 1 (car channel-list)))
-	(riece-command-join (car channel-list)))
+	(riece-command-join (riece-parse-identity (car channel-list))))
       (setq channel-list (cdr channel-list))))
   (run-hooks 'riece-after-login-hook))