summaryrefslogtreecommitdiff
path: root/jabber-chatstates.el
diff options
context:
space:
mode:
authorMagnus Henoch <mange@freemail.hu>2007-09-09 14:06:11 +0000
committerKirill A. Korinskiy <catap@catap.ru>2007-09-09 14:06:11 +0000
commit1710ee48e99c2ab55e75004ec17e93815329b03c (patch)
treeb4547d03eb0f033b40580282f88a6d868d94e634 /jabber-chatstates.el
parent24432931cad22d7f0aff01371de0f23122fb2de6 (diff)
Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-408
Creator: Magnus Henoch <mange@freemail.hu> Obey jabber-chatstates-requested (Still need to set it to nil somewhere)
Diffstat (limited to 'jabber-chatstates.el')
-rw-r--r--jabber-chatstates.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/jabber-chatstates.el b/jabber-chatstates.el
index 6bcaba1..6893124 100644
--- a/jabber-chatstates.el
+++ b/jabber-chatstates.el
@@ -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 @@ It can be sent and cancelled several times.")
(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 @@ It can be sent and cancelled several times.")
(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