projects
/
elisp
/
riece.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark outgoing encrypted message.
[elisp/riece.git]
/
lisp
/
riece-icon.el
diff --git
a/lisp/riece-icon.el
b/lisp/riece-icon.el
index
ab1a07f
..
a137fd0
100644
(file)
--- 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
;; 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:
;;; Commentary:
@@
-181,8
+181,6
@@
static char * a_xpm[] = {
\" @@@@@@@@@@@ \",
\" \"};")
\" @@@@@@@@@@@ \",
\" \"};")
-(defvar riece-icon-enabled nil)
-
(defconst riece-icon-description
"Display icons in IRC buffers.")
(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 ()
'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))
(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 ()
(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))
(let ((images (riece-icon-make-images riece-channel-list-icons)))
(save-excursion
(goto-char (point-min))
@@
-336,11
+334,11
@@
Modify whole identification by side effect."
(when riece-user-list-buffer
(set-buffer riece-user-list-buffer)
(remove-hook 'riece-update-buffer-functions
(when riece-user-list-buffer
(set-buffer riece-user-list-buffer)
(remove-hook 'riece-update-buffer-functions
- 'riece-icon-update-user-list-buffer))
+ 'riece-icon-update-user-list-buffer t))
(when riece-channel-list-buffer
(set-buffer riece-channel-list-buffer)
(remove-hook 'riece-update-buffer-functions
(when riece-channel-list-buffer
(set-buffer riece-channel-list-buffer)
(remove-hook 'riece-update-buffer-functions
- 'riece-icon-update-user-list-buffer)))
+ 'riece-icon-update-channel-list-buffer t)))
(remove-hook 'riece-user-list-mode-hook
'riece-icon-user-list-mode-hook)
(remove-hook 'riece-channel-list-mode-hook
(remove-hook 'riece-user-list-mode-hook
'riece-icon-user-list-mode-hook)
(remove-hook 'riece-channel-list-mode-hook
@@
-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)
(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))
(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)
(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))
(if riece-current-channel
(riece-emit-signal 'user-list-changed riece-current-channel))
(riece-emit-signal 'channel-list-changed))