* riece-unread.el (riece-unread-display-message-function): Delete the

[riece] / lisp / riece-300.el

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 839d7b9..da7b073 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-commands)
 
@@ -65,7 +63,9 @@
                           "away"
                         "not away")))
              "\n"))))
-      (setq replies (cdr replies)))))
+      (setq replies (cdr replies)))
+  (riece-update-status-indicators)
+  (force-mode-line-update t)))
 
 (defun riece-handle-303-message (prefix number name string)
   (riece-insert-info
@@ -86,13 +86,19 @@
        (concat
        (riece-concat-server-name
         (format "%s is away: %s" user message))
-       "\n")))))
+       "\n")))
+  (riece-update-status-indicators)
+  (force-mode-line-update t)))
 
 (defun riece-handle-305-message (prefix number name string)
-  (riece-user-toggle-away riece-real-nickname nil))
+  (riece-user-toggle-away riece-real-nickname nil)
+  (riece-update-status-indicators)
+  (force-mode-line-update t))
 
 (defun riece-handle-306-message (prefix number name string)
-  (riece-user-toggle-away riece-real-nickname t))
+  (riece-user-toggle-away riece-real-nickname t)
+  (riece-update-status-indicators)
+  (force-mode-line-update t))
 
 (defun riece-handle-311-message (prefix number name string)
   (if (string-match
@@ -186,7 +192,7 @@
       (let* ((channel (match-string 1 string))
             (visible (match-string 2 string))
             (topic (substring string (match-end 0))))
-       (let ((buffer (cdr (riece-identity-assoc-no-server
+       (let ((buffer (cdr (riece-identity-assoc
                            (riece-make-identity channel)
                            riece-channel-buffer-alist))))
          (riece-insert-info buffer (concat visible " users, topic: "
@@ -211,7 +217,7 @@
        (while modes
          (riece-channel-toggle-mode channel (car modes) (eq toggle ?+))
          (setq modes (cdr modes)))
-       (let ((buffer (cdr (riece-identity-assoc-no-server
+       (let ((buffer (cdr (riece-identity-assoc
                            (riece-make-identity channel)
                            riece-channel-buffer-alist))))
          (riece-insert-info buffer (concat "Mode: " mode-string "\n"))
@@ -223,13 +229,15 @@
           (concat
            (riece-concat-server-name
             (format "Mode for %s: %s" channel mode-string))
-           "\n"))))))
+           "\n")))
+       (riece-update-channel-indicator)
+       (force-mode-line-update t))))
 
 (defun riece-handle-set-topic (prefix number name string remove)
   (if (string-match "^\\([^ ]+\\) :" string)
       (let* ((channel (match-string 1 string))
             (message (substring string (match-end 0)))
-            (buffer (cdr (riece-identity-assoc-no-server
+            (buffer (cdr (riece-identity-assoc
                           (riece-make-identity channel)
                           riece-channel-buffer-alist))))
        (if remove
@@ -257,7 +265,7 @@
   (if (string-match "^\\([^ ]+\\) " string)
       (let* ((channel (match-string 1 string))
             (user (substring string (match-end 0)))
-            (buffer (cdr (riece-identity-assoc-no-server
+            (buffer (cdr (riece-identity-assoc
                           (riece-make-identity channel)
                           riece-channel-buffer-alist))))
        (riece-insert-info buffer (concat "Inviting " user "\n"))
@@ -283,7 +291,7 @@
             (flag (match-string 8 string))
             (hops (match-string 9 string))
             (name (substring string (match-end 0)))
-            (buffer (cdr (riece-identity-assoc-no-server
+            (buffer (cdr (riece-identity-assoc
                           (riece-make-identity channel)
                           riece-channel-buffer-alist))))
        (riece-naming-assert-join nick channel)