X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-icon.el;h=a137fd0eddb1b5095f4ac5b414512bcd6413c251;hb=737abec28c278fe3ea2dfa04565ab8f5b701b9f0;hp=76e3aef34ec8bfdb753253e29119c3e569b5ef9e;hpb=9a29ee58233d7dfa8c1f4c1485930bf530e374af;p=elisp%2Friece.git

diff --git a/lisp/riece-icon.el b/lisp/riece-icon.el
index 76e3aef..a137fd0 100644
--- a/lisp/riece-icon.el
+++ b/lisp/riece-icon.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -181,8 +181,6 @@ static char * a_xpm[] = {
 \"  @@@@@@@@@@@ \",
 \"              \"};")
 
-(defvar riece-icon-enabled nil)
-
 (defconst riece-icon-description
   "Display icons in IRC buffers.")
 
@@ -236,7 +234,7 @@ static char * a_xpm[] = {
 				   'rear-nonsticky (list 'display)))))))
 
 (defun riece-icon-update-user-list-buffer ()
-  (if riece-icon-enabled
+  (if (get 'riece-icon 'riece-addon-enabled)
       (let ((images (riece-icon-make-images riece-user-list-icons)))
 	(save-excursion
 	  (goto-char (point-min))
@@ -246,7 +244,7 @@ static char * a_xpm[] = {
 	     (1- (point)) (point)))))))
 
 (defun riece-icon-update-channel-list-buffer ()
-  (if riece-icon-enabled
+  (if (get 'riece-icon 'riece-addon-enabled)
       (let ((images (riece-icon-make-images riece-channel-list-icons)))
 	(save-excursion
 	  (goto-char (point-min))
@@ -366,7 +364,6 @@ Modify whole identification by side effect."
   (defalias 'riece-mode-line-buffer-identification
     'riece-icon-modeline-buffer-identification)
   (riece-icon-update-mode-line-buffer-identification)
-  (setq riece-icon-enabled t)
   (if riece-current-channel
       (riece-emit-signal 'user-list-changed riece-current-channel))
   (riece-emit-signal 'channel-list-changed))
@@ -375,7 +372,6 @@ Modify whole identification by side effect."
   (fset 'riece-mode-line-buffer-identification
 	riece-icon-original-mode-line-buffer-identification)
   (riece-icon-update-mode-line-buffer-identification)
-  (setq riece-icon-enabled nil)
   (if riece-current-channel
       (riece-emit-signal 'user-list-changed riece-current-channel))
   (riece-emit-signal 'channel-list-changed))