X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-message.el;h=bf2831011450484b70d2f3d2b1385dea8b24d4b4;hb=57d046780969b7e65645f16ed42e178b43b8e206;hp=6acb78e15a02f43b5c96c32ac20cfbdc15a0f49c;hpb=fe7ce5e9a344721b1ecdd4d9ec1adce5dc908a49;p=riece

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 6acb78e..bf28310 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -63,36 +63,27 @@
 
 (defun riece-message-make-open-bracket (message)
   "Makes `open-bracket' string for MESSAGE."
-  (riece-message-make-bracket message t))
+  (if (riece-message-own-p message)
+      ">"
+    (if (eq (riece-message-type message) 'notice)
+	"{"
+      (if (riece-message-private-p message)
+	  "="
+	(if (riece-message-external-p message)
+	    "("
+	  "<")))))
 
 (defun riece-message-make-close-bracket (message)
   "Makes `close-bracket' string for MESSAGE."
-  (riece-message-make-bracket message nil))
-
-(defun riece-message-make-bracket (message open-p)
-  (if (eq open-p (riece-message-own-p message))
-      (if (eq (riece-message-type message) 'notice)
-	  "-"
-	(if (eq (riece-message-type message) 'action)
-	    "]"
-	  (if (riece-message-private-p message)
-	      (if (riece-message-own-p message)
-		  ">"
-		"=")
-	    (if (riece-message-external-p message)
-		")"
-	      ">"))))
+  (if (riece-message-own-p message)
+      "<"
     (if (eq (riece-message-type message) 'notice)
-	"-"
-      (if (eq (riece-message-type message) 'action)
-	  "["
-	(if (riece-message-private-p message)
-	    (if (riece-message-own-p message)
-		  "<"
-	      "=")
-	  (if (riece-message-external-p message)
-	      "("
-	    "<"))))))
+	"}"
+      (if (riece-message-private-p message)
+	  "="
+	(if (riece-message-external-p message)
+	    ")"
+	  ">")))))
 
 (defun riece-message-make-name (message)
   "Makes local identity for MESSAGE."
@@ -113,13 +104,12 @@
 
 (defun riece-message-buffer (message)
   "Return the buffer where MESSAGE should appear."
-  (let* ((target (if (riece-identity-equal-no-server
+  (let* ((target (if (riece-identity-equal
 		      (riece-message-target message)
 		      (riece-current-nickname))
 		     (riece-message-speaker message)
 		   (riece-message-target message)))
-	 (entry (riece-identity-assoc-no-server
-		 target riece-channel-buffer-alist)))
+	 (entry (riece-identity-assoc target riece-channel-buffer-alist)))
     (unless entry
       (riece-join-channel target)
       ;; If you are not joined any channel,
@@ -127,8 +117,7 @@
       (unless riece-current-channel
 	(riece-switch-to-channel target))
       (riece-redisplay-buffers)
-      (setq entry (riece-identity-assoc-no-server
-		   target riece-channel-buffer-alist)))
+      (setq entry (riece-identity-assoc target riece-channel-buffer-alist)))
     (cdr entry)))
 
 (defun riece-message-parent-buffers (message buffer)
@@ -136,7 +125,7 @@
 Normally they are *Dialogue* and/or *Others*."
   (if (or (and buffer (riece-frozen buffer))
 	  (and riece-current-channel
-	       (not (riece-identity-equal-no-server
+	       (not (riece-identity-equal
 		     (riece-message-target message)
 		     riece-current-channel))))
       (list riece-dialogue-buffer riece-others-buffer)
@@ -144,16 +133,23 @@ Normally they are *Dialogue* and/or *Others*."
 
 (defun riece-display-message (message)
   "Display MESSAGE object."
-  (let* ((open-bracket
-	  (funcall riece-message-make-open-bracket-function message))
-	 (close-bracket
-	  (funcall riece-message-make-close-bracket-function message))
-	 (name
-	  (funcall riece-message-make-name-function message))
-	 (global-name
-	  (funcall riece-message-make-global-name-function message))
-	 (buffer (riece-message-buffer message))
-	 (parent-buffers (riece-message-parent-buffers message buffer)))
+  (let ((open-bracket
+	 (funcall riece-message-make-open-bracket-function message))
+	(close-bracket
+	 (funcall riece-message-make-close-bracket-function message))
+	(name
+	 (funcall riece-message-make-name-function message))
+	(global-name
+	 (funcall riece-message-make-global-name-function message))
+	(buffer (riece-message-buffer message))
+	parent-buffers)
+    (when (and buffer
+	       (riece-message-own-p message)
+	       (riece-own-frozen buffer))
+      (with-current-buffer buffer
+	(setq riece-freeze nil))
+      (riece-update-status-indicators))
+    (setq parent-buffers (riece-message-parent-buffers message buffer))
     (riece-insert buffer
 		  (concat open-bracket name close-bracket
 			  " " (riece-message-text message) "\n"))
@@ -200,13 +196,13 @@ Currently possible values are `action' and `notice'."
   "Return t if MESSAGE is a private message."
   (if (riece-message-own-p message)
       (not (riece-channel-p (riece-message-target message)))
-    (riece-identity-equal-no-server
+    (riece-identity-equal
      (riece-message-target message)
      (riece-current-nickname))))
 
 (defun riece-message-external-p (message)
   "Return t if MESSAGE is from outside the channel."
-  (not (riece-identity-member-no-server
+  (not (riece-identity-member
 	(riece-message-target message)
 	(mapcar #'riece-make-identity
 		(riece-user-get-channels (riece-message-speaker message))))))