* riece-history.el (riece-history-requires): New function.

[riece] / lisp / riece-xface.el

diff --git a/lisp/riece-xface.el b/lisp/riece-xface.el
index 1ec5066..b94b006 100644 (file)
--- a/lisp/riece-xface.el
+++ b/lisp/riece-xface.el
@@ -1,4 +1,4 @@
-;;; riece-xface.el --- display X-Face in user list buffer
+;;; riece-xface.el --- display X-Face in IRC buffers
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -24,20 +24,19 @@
 
 ;;; Commentary:
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-xface)
+;; NOTE: This is an add-on module for Riece.
 
 ;;; Code:
 
 (require 'riece-identity)
 (require 'riece-globals)
 (require 'riece-display)
-(require 'riece-lsdb)
+(eval-when-compile (require 'riece-lsdb))
 
 (defvar riece-xface-enabled nil)
 
 (defconst riece-xface-description
-  "Display X-Face in user list buffer")
+  "Display X-Face in IRC buffers.")
 
 (defvar lsdb-insert-x-face-function)
 
@@ -64,11 +63,20 @@
 (defun riece-xface-requires ()
   '(riece-lsdb))
 
+(defun riece-xface-user-list-mode-hook ()
+  (add-hook 'riece-update-buffer-functions
+           'riece-xface-update-user-list-buffer t t))
+
 (defun riece-xface-insinuate ()
   (add-hook 'riece-user-list-mode-hook
-           (lambda ()
-             (add-hook 'riece-update-buffer-functions
-                       'riece-xface-update-user-list-buffer t t))))
+           'riece-xface-user-list-mode-hook))
+
+(defun riece-xface-uninstall ()
+  (remove-hook 'riece-user-list-mode-hook
+              'riece-xface-user-list-mode-hook)
+  (with-current-buffer riece-user-list-buffer
+    (remove-hook 'riece-update-buffer-functions
+                'riece-xface-update-user-list-buffer t)))
 
 (defun riece-xface-enable ()
   (setq riece-xface-enabled t)