emacs-jabber jabber-events.el,1.11,1.12

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

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

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

Check jabber-chatting-with being non-nil in jabber-events-confirm-display-in-window


Index: jabber-events.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-events.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jabber-events.el	5 Feb 2007 21:59:03 -0000	1.11
+++ jabber-events.el	16 Jan 2008 17:48:18 -0000	1.12
@@ -1,6 +1,6 @@
 ;;; jabber-events.el --- Message events (JEP-0022) implementation
 
-;; Copyright (C) 2005  Magnus Henoch
+;; Copyright (C) 2005, 2008  Magnus Henoch
 
 ;; Author: Magnus Henoch <ma...@fr...>
 
@@ -124,6 +124,10 @@
     (when (and jabber-events-confirm-displayed
 	       (not jabber-events-display-confirmed)
 	       (memq 'displayed jabber-events-requested)
+	       ;; XXX: if jabber-events-requested is non-nil, how can
+	       ;; jabber-chatting-with be nil?  See
+	       ;; http://sourceforge.net/tracker/index.php?func=detail&aid=1872560&group_id=88346&atid=586350
+	       jabber-chatting-with
 	       ;; don't send to bare jids
 	       (jabber-jid-resource jabber-chatting-with))
       (jabber-send-sexp