Specify "mode: text" as well as "mode: outline".

[riece] / lisp / riece-xface.el

diff --git a/lisp/riece-xface.el b/lisp/riece-xface.el
index 30f7bb4..a4fd4ae 100644 (file)
--- a/lisp/riece-xface.el
+++ b/lisp/riece-xface.el
@@ -33,15 +33,13 @@
 (require 'riece-display)
 (require 'riece-lsdb)
 
-(defvar riece-xface-enabled nil)
-
 (defconst riece-xface-description
   "Display X-Face in IRC buffers.")
 
 (defvar lsdb-insert-x-face-function)
 
 (defun riece-xface-update-user-list-buffer ()
-  (if riece-xface-enabled
+  (if (get 'riece-xface 'riece-addon-enabled)
       (riece-scan-property-region
        'riece-identity (point-min)(point-max)
        (lambda (start end)
@@ -68,23 +66,25 @@
            'riece-xface-update-user-list-buffer t t))
 
 (defun riece-xface-insinuate ()
+  (if riece-user-list-buffer
+      (with-current-buffer riece-user-list-buffer
+       (riece-xface-user-list-mode-hook)))
   (add-hook 'riece-user-list-mode-hook
            'riece-xface-user-list-mode-hook))
 
 (defun riece-xface-uninstall ()
+  (if riece-user-list-buffer
+      (with-current-buffer riece-user-list-buffer
+       (remove-hook 'riece-update-buffer-functions
+                    'riece-xface-update-user-list-buffer t)))
   (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)))
+              'riece-xface-user-list-mode-hook))
 
 (defun riece-xface-enable ()
-  (setq riece-xface-enabled t)
   (if riece-current-channel
       (riece-emit-signal 'user-list-changed riece-current-channel)))
 
 (defun riece-xface-disable ()
-  (setq riece-xface-enabled nil)
   (if riece-current-channel
       (riece-emit-signal 'user-list-changed riece-current-channel)))