X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-icon.el;h=ab1a07fc1e8188705fb28e05afa421d078bd115b;hp=e3232bd8a45dca085e77e675f8bedd6ce3bc90c4;hb=75da0cac1d564a5dbdd91b2b696b333ee62b1ff5;hpb=b1532be62045dfee86d080aeaa4e43e0b7f52fad

diff --git a/lisp/riece-icon.el b/lisp/riece-icon.el
index e3232bd..ab1a07f 100644
--- a/lisp/riece-icon.el
+++ b/lisp/riece-icon.el
@@ -319,23 +319,32 @@ Modify whole identification by side effect."
 		'riece-icon-update-channel-list-buffer t t)))
 
 (defun riece-icon-insinuate ()
+  (save-excursion
+    (when riece-user-list-buffer
+      (set-buffer riece-user-list-buffer)
+      (riece-icon-user-list-mode-hook))
+    (when riece-channel-list-buffer
+      (set-buffer riece-channel-list-buffer)
+      (riece-icon-channel-list-mode-hook)))
   (add-hook 'riece-user-list-mode-hook
 	    'riece-icon-user-list-mode-hook)
   (add-hook 'riece-channel-list-mode-hook
 	    'riece-icon-channel-list-mode-hook))
 
 (defun riece-icon-uninstall ()
+  (save-excursion
+    (when riece-user-list-buffer
+      (set-buffer riece-user-list-buffer)
+      (remove-hook 'riece-update-buffer-functions
+		   'riece-icon-update-user-list-buffer))
+    (when riece-channel-list-buffer
+      (set-buffer riece-channel-list-buffer)
+      (remove-hook 'riece-update-buffer-functions
+		   'riece-icon-update-user-list-buffer)))
   (remove-hook 'riece-user-list-mode-hook
 	       'riece-icon-user-list-mode-hook)
   (remove-hook 'riece-channel-list-mode-hook
-	       'riece-icon-channel-list-mode-hook)
-  (save-excursion
-    (set-buffer riece-user-list-buffer)
-    (remove-hook 'riece-update-buffer-functions
-		 'riece-icon-update-user-list-buffer)
-    (set-buffer riece-channel-list-buffer)
-    (remove-hook 'riece-update-buffer-functions
-		 'riece-icon-update-user-list-buffer)))
+	       'riece-icon-channel-list-mode-hook))
 
 (defvar riece-icon-original-mode-line-buffer-identification nil)