wgreenhouse
/
emacs-jabber
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Complete full jids needed for some features to work. In such cases, its handy to complete jids with resources.

This commit is contained in:
Evgenii Terechkov 2010-01-28 22:05:01 +07:00 committed by Kirill A. Korinskiy
parent 238733e22c
commit ac272fc844
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jabber-browse.el
View File

@ -30,7 +30,7 @@
(defun jabber-get-browse (jc to)
"send a browse infoquery request to someone"
(interactive (list (jabber-read-account)
(jabber-read-jid-completing "browse: ")))
(jabber-read-jid-completing "browse: " nil nil nil nil t)))
(jabber-send-iq jc to
"get"
'(query ((xmlns . "jabber:iq:browse")))

4
jabber-disco.el
View File

@ -180,7 +180,7 @@ See JEP-0030."
(defun jabber-get-disco-items (jc to &optional node)
"Send a service discovery request for items"
(interactive (list (jabber-read-account)
(jabber-read-jid-completing "Send items disco request to: ")
(jabber-read-jid-completing "Send items disco request to: " nil nil nil 'full t)
(jabber-read-node "Node (or leave empty): ")))
(jabber-send-iq jc to
"get"
@ -195,7 +195,7 @@ See JEP-0030."
(defun jabber-get-disco-info (jc to &optional node)
"Send a service discovery request for info"
(interactive (list (jabber-read-account)
(jabber-read-jid-completing "Send info disco request to: ")
(jabber-read-jid-completing "Send info disco request to: " nil nil nil 'full t)
(jabber-read-node "Node (or leave empty): ")))
(jabber-send-iq jc to
"get"

2
jabber-ft-client.el
View File

@ -28,7 +28,7 @@
(defun jabber-ft-send (jc jid filename desc)
"Attempt to send FILENAME to JID."
(interactive (list (jabber-read-account)
(jabber-read-jid-completing "Send file to: " nil nil nil 'full)
(jabber-read-jid-completing "Send file to: " nil nil nil 'full t)
(read-file-name "Send which file: " nil nil t)
(jabber-read-with-input-method "Description (optional): ")))
(if (zerop (length desc)) (setq desc nil))

4
jabber-time.el
View File

@ -31,7 +31,7 @@
"Request time"
(interactive (list (jabber-read-account)
(jabber-read-jid-completing "Request time of: "
nil nil nil 'full)))
nil nil nil 'full t)))
(jabber-send-iq jc to
"get"
'(query ((xmlns . "jabber:iq:time")))
@ -81,7 +81,7 @@
"Request idle time of user."
(interactive (list (jabber-read-account)
(jabber-read-jid-completing "Get idle time for: "
nil nil nil 'full)))
nil nil nil 'full t)))
(jabber-send-iq jc to
"get"
'(query ((xmlns . "jabber:iq:last")))

7
jabber-util.el
View File

@ -225,7 +225,12 @@ If FULLJIDS is non-nil, complete jids with resources."
(if (symbolp default)
(symbol-name default)
default))
(get-text-property (point) 'jabber-jid)
(let* ((jid (get-text-property (point) 'jabber-jid))
(res (get (jabber-jid-symbol jid) 'resource)))
(when jid
(if (and fulljids res (not (jabber-jid-resource jid)))
(format "%s/%s" jid res)
jid)))
(bound-and-true-p jabber-chatting-with)
(bound-and-true-p jabber-group)))
(completion-ignore-case t)

2
jabber-version.el
View File

@ -34,7 +34,7 @@
"Request software version"
(interactive (list
(jabber-read-account)
(jabber-read-jid-completing "Request version of: " nil nil nil 'full)))
(jabber-read-jid-completing "Request version of: " nil nil nil 'full t)))
(jabber-send-iq jc to
"get"
'(query ((xmlns . "jabber:iq:version")))