diff options
| author | Magnus Henoch <mange@freemail.hu> | 2004-05-01 14:35:45 +0000 |
|---|---|---|
| committer | Kirill A. Korinskiy <catap@catap.ru> | 2004-05-01 14:35:45 +0000 |
| commit | aaf245ebef3a1b6e30451177b7430723f0f35238 (patch) | |
| tree | 91e2bce73f84a20cc975347e73178c0af40236ca /jabber-presence.el | |
| parent | bcf9b59b384d2d8aeaf4bcc6cd836646004c6bc9 (diff) | |
Revision: mange@freemail.hu--2004/emacs-jabber--cvs-head--0--patch-10
Creator: Magnus Henoch <mange@freemail.hu>
Treat JIDs case-insensitively
Add jabber-jid-symbol, ensuring consistent conversion from strings to JID symbols.
Use it in various places in jabber-util.el and jabber-presence.el.
Diffstat (limited to 'jabber-presence.el')
| -rw-r--r-- | jabber-presence.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jabber-presence.el b/jabber-presence.el index ca081da..0938539 100644 --- a/jabber-presence.el +++ b/jabber-presence.el @@ -46,7 +46,7 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise." ;; getting a "roster push". (dolist (item (jabber-xml-get-children (car (jabber-xml-get-children xml-data 'query)) 'item)) (let (roster-item - (jid (intern (jabber-jid-user (jabber-xml-get-attribute item 'jid)) jabber-jid-obarray))) + (jid (jabber-jid-symbol (jabber-xml-get-attribute item 'jid)))) ;; Find contact if already in roster (setq roster-item (car (memq jid *jabber-roster*))) @@ -155,7 +155,7 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise." (defun jabber-process-subscription-request (from presence-status) "process an incoming subscription request" - (run-hook-with-args 'jabber-alert-presence-hooks (intern from jabber-jid-obarray) nil "subscribe" presence-status (funcall jabber-alert-presence-message-function (intern from jabber-jid-obarray) nil "subscribe" presence-status)) + (run-hook-with-args 'jabber-alert-presence-hooks (jabber-jid-symbol from) nil "subscribe" presence-status (funcall jabber-alert-presence-message-function (jabber-jid-symbol from) nil "subscribe" presence-status)) (jabber-send-sexp (list 'presence (list (cons 'to from) (cons 'type (if (yes-or-no-p (format "the user - %s - has requested to subscribe to your presence (%s). allow? " @@ -246,7 +246,7 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise." (cons "Add/modify roster entry" 'jabber-roster-change)) (defun jabber-roster-change (jid name groups) "Add or change a roster item." - (interactive (let* ((jid (intern (jabber-read-jid-completing "Add/change JID: ") jabber-jid-obarray)) + (interactive (let* ((jid (jabber-jid-symbol (jabber-read-jid-completing "Add/change JID: "))) (name (get jid 'name)) (groups (get jid 'groups))) (list jid (jabber-read-with-input-method (format "Name: (default `%s') " name) nil nil name) |