Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15616
Modified Files:
jabber-socks5.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-427
Creator: Magnus Henoch <ma...@fr...>
Fix searching for XEP-0065 proxy
Index: jabber-socks5.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-socks5.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- jabber-socks5.el 17 Sep 2007 12:26:16 -0000 1.17
+++ jabber-socks5.el 9 Dec 2007 00:55:18 -0000 1.18
@@ -145,11 +145,14 @@
(define-enter-state jabber-socks5 seek-proxies (fsm state-data)
;; Look for items at the server.
- (jabber-disco-get-items (plist-get state-data :jc)
- nil nil
- (lambda (jc fsm result)
- (fsm-send-sync fsm (cons :items result)))
- fsm)
+ (let* ((jc (plist-get state-data :jc))
+ (server (jabber-jid-server (jabber-connection-jid jc))))
+ (jabber-disco-get-items jc
+ server
+ nil
+ (lambda (jc fsm result)
+ (fsm-send-sync fsm (cons :items result)))
+ fsm))
;; Spend no more than five seconds looking for a proxy.
(list state-data 5))
|
