emacs-jabber jabber-chat.el,1.85,1.86 NEWS,1.63,1.64

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26884

Modified Files:
	jabber-chat.el NEWS 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-442
Creator:  Magnus Henoch <ma...@fr...>

New option: jabber-chat-buffer-show-avatar


Index: jabber-chat.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chat.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- jabber-chat.el	19 Sep 2007 09:06:37 -0000	1.85
+++ jabber-chat.el	4 Feb 2008 16:54:16 -0000	1.86
@@ -1,6 +1,6 @@
 ;; jabber-chat.el - one-to-one chats
 
-;; Copyright (C) 2005, 2007 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2005, 2007, 2008 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -41,9 +41,10 @@
   :group 'jabber-chat)
 
 (defcustom jabber-chat-header-line-format
-  '("" (:eval (let ((buddy (jabber-jid-symbol jabber-chatting-with)))
-		(jabber-propertize " "
-				   'display (get buddy 'avatar))))
+  '("" (jabber-chat-buffer-show-avatar
+	(let ((buddy (jabber-jid-symbol jabber-chatting-with)))
+	  (jabber-propertize " "
+			     'display (get buddy 'avatar))))
     (:eval (jabber-jid-displayname jabber-chatting-with))
     "\t" (:eval (let ((buddy (jabber-jid-symbol jabber-chatting-with)))
 		  (propertize 
@@ -62,6 +63,13 @@
   :type 'sexp
   :group 'jabber-chat)
 
+(defcustom jabber-chat-buffer-show-avatar t
+  "Show avatars in header line of chat buffer?
+This variable might not take effect if you have changed
+`jabber-chat-header-line-format'."
+  :type 'boolean
+  :group 'jabber-chat)
+
 (defcustom jabber-chat-time-format "%H:%M"
   "The format specification for instant messages in the chat buffer.
 See also `jabber-chat-delayed-time-format'.

Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- NEWS	17 Nov 2007 11:29:01 -0000	1.63
+++ NEWS	4 Feb 2008 16:54:16 -0000	1.64
@@ -31,6 +31,9 @@
 Subscription requests now displayed in chat buffers. See "Presence
 subscription" section in manual.
 
+** Option: hide avatar in chat buffer
+`jabber-chat-buffer-show-avatar'.  (not documented yet)
+
 * New features in jabber.el 0.7.1
 
 ** STARTTLS