X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ignore.el;h=7beea30717ab15ec8603a0a66e5cbbfac3634d63;hb=255cb67bb0bb83e1409d08efdad27a61ca03fdd9;hp=6b091d797e7106f5a083d4ebd4427a79ca777233;hpb=8bb0858f2815a32b2cd471fbdfbda2e86e82eb07;p=riece

diff --git a/lisp/riece-ignore.el b/lisp/riece-ignore.el
index 6b091d7..7beea30 100644
--- a/lisp/riece-ignore.el
+++ b/lisp/riece-ignore.el
@@ -60,8 +60,6 @@ Otherwise, they are not removed from IRC buffers, but are hidden with
 
 (defvar riece-ignore-buffer nil)
 
-(defvar riece-ignore-enabled nil)
-
 (defconst riece-ignore-description
   "Ignore messages from some users.")
 (defvar riece-ignored-user-list nil)
@@ -103,7 +101,7 @@ Otherwise, they are not removed from IRC buffers, but are hidden with
 (eval-when-compile
   (autoload 'riece-dialogue-mode "riece"))
 (defun riece-ignore-message-filter (message)
-  (if (and riece-ignore-enabled
+  (if (and (get 'riece-ignore 'riece-addon-enabled)
 	   (riece-identity-member (riece-message-speaker message)
 				  riece-ignored-user-list))
       (if riece-ignore-discard-message
@@ -133,15 +131,17 @@ Otherwise, they are not removed from IRC buffers, but are hidden with
 	(mapcar #'riece-parse-identity riece-startup-ignored-user-list))
   (add-hook 'riece-message-filter-functions 'riece-ignore-message-filter))
 
+(defun riece-ignore-uninstall ()
+  (setq riece-ignored-user-list nil)
+  (remove-hook 'riece-message-filter-functions 'riece-ignore-message-filter))
+
 (defun riece-ignore-enable ()
   (define-key riece-command-mode-map
-    "\C-ck" 'riece-ignore-user)
-  (setq riece-ignore-enabled t))
+    "\C-ck" 'riece-ignore-user))
 
 (defun riece-ignore-disable ()
   (define-key riece-command-mode-map
-    "\C-ck" nil)
-  (setq riece-ignore-enabled nil))
+    "\C-ck" nil))
 
 (provide 'riece-ignore)