X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-unread.el;h=13563859a1fe66e9c28411e9848042d10a92fbe9;hp=0f83689ad8def0956779b0da12d83bd6d682be87;hb=58493f60ccd09128dfc78e6f88e980fc62907c6d;hpb=4bbf0d678d33ba4aafa5aa6ac458765774bee963

diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el
index 0f83689..1356385 100644
--- a/lisp/riece-unread.el
+++ b/lisp/riece-unread.el
@@ -61,42 +61,35 @@
 
 (defun riece-unread-after-display-message-function (message)
   (unless (or (riece-message-own-p message)
-	      (equal (riece-message-target message) riece-current-channel))
+	      (riece-message-type message)
+	      (riece-identity-equal (riece-message-target message)
+				    riece-current-channel)
+	      (riece-identity-member (riece-message-target message)
+				     riece-unread-channels))
     (setq riece-unread-channels
-	  (delete (riece-message-target message) riece-unread-channels))
-    (add-to-list 'riece-unread-channels
-		 (riece-message-target message))
-    (riece-unread-update-channel-list-buffer)))
+	  (cons (riece-message-target message) riece-unread-channels))
+    (riece-redisplay-buffers)))
 
 (defun riece-unread-after-switch-to-channel-function (last)
   (setq riece-unread-channels
 	(delete riece-current-channel
-		riece-unread-channels))
-  (riece-unread-update-channel-list-buffer))
-
-(defun riece-unread-update-channel-list-buffer ()
-  (if riece-channel-list-buffer-mode
-      (save-excursion
-	(set-buffer riece-channel-list-buffer)
-	(let ((inhibit-read-only t)
-	      buffer-read-only)
-	  (goto-char (point-min))
-	  (while (not (eobp))
-	    (if (looking-at "\\( ?[0-9]+:\\)\\(.\\)\\(.+\\)")
-		(let ((channel (save-match-data
-				 (riece-parse-identity (match-string 3)))))
-		  (replace-match
-		   (concat "\\1"
-			   (if (member channel riece-unread-channels)
-			       "!"
-			     "\\2")
-			   "\\3"))))
-	    (forward-line))))))
-      
+		riece-unread-channels)))
+
+(defun riece-unread-format-channel-list-line (index channel)
+  (if (riece-identity-member channel riece-unread-channels)
+      (concat (format "%2d:!" index)
+	      (riece-format-identity channel)
+	      "\n")))
+
 (defun riece-unread-switch-to-channel ()
   (interactive)
-  (if (car riece-unread-channels)
-      (riece-command-switch-to-channel (car riece-unread-channels))
+  (if riece-unread-channels
+      (let ((channel (car riece-unread-channels)))
+	(if (riece-identity-member channel riece-current-channels)
+	    (riece-command-switch-to-channel channel)
+	  (setq riece-unread-channels
+		(delete channel riece-unread-channels))
+	  (riece-unread-switch-to-channel)))
     (error "No unread channel!")))
 
 (defun riece-guess-channel-from-unread ()
@@ -119,8 +112,8 @@
 	    'riece-unread-after-display-message-function)
   (add-hook 'riece-after-switch-to-channel-functions
 	    'riece-unread-after-switch-to-channel-function)
-  (add-hook 'riece-update-buffer-functions
-	    'riece-unread-update-channel-list-buffer t)
+  (add-hook 'riece-format-channel-list-line-functions
+	    'riece-unread-format-channel-list-line)
   (define-key riece-command-mode-map
     "\C-c\C-u" 'riece-unread-switch-to-channel)
   (define-key riece-dialogue-mode-map