summaryrefslogtreecommitdiff
path: root/jabber-presence.el
diff options
context:
space:
mode:
authorMagnus Henoch <mange@freemail.hu>2006-08-29 11:06:46 +0000
committerKirill A. Korinskiy <catap@catap.ru>2006-08-29 11:06:46 +0000
commit05e8362ebca9d6deabe26a98ccf4e94fa29078c7 (patch)
tree3a7837c348adde7e6e8637480913f860f57d8412 /jabber-presence.el
parentab91f0bb7cdadf997769ec74cbb6b67be628a5a3 (diff)
Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-254
Creator: Magnus Henoch <mange@freemail.hu> Fix sending request string in subscription requests This has been wrong for years... but now it's finally fixed.
Diffstat (limited to 'jabber-presence.el')
-rw-r--r--jabber-presence.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/jabber-presence.el b/jabber-presence.el
index 275324d..5bb4367 100644
--- a/jabber-presence.el
+++ b/jabber-presence.el
@@ -305,10 +305,11 @@ and `jabber-default-status'."
"send a subscription request to jid, showing him your request text, if specified"
(interactive (list (jabber-read-jid-completing "to: ")
(jabber-read-with-input-method "request: ")))
- (jabber-send-sexp `(presence ((to . ,to)
- (type . "subscribe"))
- ,(if (and request (> (length request) 0))
- request))))
+ (jabber-send-sexp `(presence
+ ((to . ,to)
+ (type . "subscribe"))
+ ,@(when (and request (> (length request) 0))
+ (list `(status () ,request))))))
(add-to-list 'jabber-jid-roster-menu
(cons "Add/modify roster entry" 'jabber-roster-change))