[SCM] emacs-jabber branch, master, updated. 0df441a41092596b2dde47442c310c54dd797e07

[Magnus H. <leg...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  0df441a41092596b2dde47442c310c54dd797e07 (commit)
      from  1ea60b5549345a297309e9087388987dd6fbec89 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0df441a41092596b2dde47442c310c54dd797e07
Author: Magnus Henoch <mag...@gm...>
Date:   Thu Jun 12 19:59:48 2014 +0100

    Fix closure data when retrying caps disco request
    
    The closure data used in jabber-process-caps-modern was a three-element
    list, while the one used in jabber-caps-try-next was a cons cell.  This
    led to crashes in jabber-process-caps-info-error when there were more
    than one contact with the same caps hash, all failing to respond.

diff --git a/jabber-disco.el b/jabber-disco.el
index fcb91ae..cab427f 100644
--- a/jabber-disco.el
+++ b/jabber-disco.el
@@ -479,8 +479,8 @@ Return (IDENTITIES FEATURES), or nil if not in cache."
 	       "get"
 	       `(query ((xmlns . "http://jabber.org/protocol/disco#info")
 			(node . ,(concat node "#" ver))))
-	       #'jabber-process-caps-info-result key
-	       #'jabber-process-caps-info-error key))
+	       #'jabber-process-caps-info-result (list hash node ver)
+	       #'jabber-process-caps-info-error (list hash node ver)))
 	  ;; No, forget about it for now.
 	  (remhash key jabber-caps-cache))))))
 

-----------------------------------------------------------------------

Summary of changes:
 jabber-disco.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
emacs-jabber