emacs-jabber jabber-chatstates.el,1.1,1.2

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv17933

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

Obey jabber-chatstates-requested

(Still need to set it to nil somewhere)


Index: jabber-chatstates.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chatstates.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jabber-chatstates.el	24 Aug 2007 01:36:06 -0000	1.1
+++ jabber-chatstates.el	9 Sep 2007 14:06:11 -0000	1.2
@@ -54,7 +54,8 @@
 (defun jabber-chatstates-when-sending (text id)
   (jabber-chatstates-update-message)
   (jabber-chatstates-stop-timer)
-  `((active ((xmlns . ,jabber-chatstates-xmlns)))))
+  (when jabber-chatstates-requested
+    `((active ((xmlns . ,jabber-chatstates-xmlns))))))
 
 ;;; OUTGOING
 ;;; Code for handling requests for chat state notifications and providing
@@ -91,7 +92,7 @@
 
 (defun jabber-chatstates-send-paused ()
   "Send an 'paused state notification."
-  (when jabber-chatting-with
+  (when (and jabber-chatstates-requested jabber-chatting-with)
     (setq jabber-chatstates-composing-sent nil)
     (jabber-send-sexp
      jabber-buffer-connection
@@ -104,6 +105,7 @@
          (state (if composing-now 'composing 'active)))
     (when (and jabber-chatstates-confirm
                jabber-chatting-with
+	       jabber-chatstates-requested
                (not (eq composing-now jabber-chatstates-composing-sent)))
       (jabber-send-sexp
        jabber-buffer-connection