[SCM] emacs-jabber branch, master, updated. 523f5265a2b3a873849955b3775e1d90c2066703

[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  523f5265a2b3a873849955b3775e1d90c2066703 (commit)
      from  ec3b2ee6be48c758b13a573f9041f18a38ca25b1 (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 523f5265a2b3a873849955b3775e1d90c2066703
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Feb 9 12:28:43 2013 +0000

    jabber-newdisco: Don't leave stray nulls in attribute lists
    
    While jabber-sexp2xml has no problems with them, xml-print (used by
    jabber-console) doesn't like them.  This causes truncated stanzas in
    the XML log and error messages like these:
    
    Couldn't write XML log: Wrong type argument: char-or-string-p, nil

diff --git a/jabber-newdisco.el b/jabber-newdisco.el
index f4b2a15..aefa910 100644
--- a/jabber-newdisco.el
+++ b/jabber-newdisco.el
@@ -49,7 +49,7 @@ invalidate cache and get fresh data."
       (jabber-send-iq jc jid
 		      "get"
 		      `(query ((xmlns . "http://jabber.org/protocol/disco#info")
-			       ,(when node `(node . ,node))))
+			       ,@(when node `((node . ,node)))))
 		      #'jabber-disco-got-info (cons callback closure-data)
 		      (lambda (jc xml-data callback-data)
 			(when (car callback-data)
@@ -104,7 +104,7 @@ invalidate cache and get fresh data."
       (jabber-send-iq jc jid
 		      "get"
 		      `(query ((xmlns . "http://jabber.org/protocol/disco#items")
-			       ,(when node `(node . ,node))))
+			       ,@(when node `((node . ,node)))))
 		      #'jabber-disco-got-items (cons callback closure-data)
 		      (lambda (jc xml-data callback-data)
 			(when (car callback-data)
@@ -137,13 +137,13 @@ invalidate cache and get fresh data."
   (jabber-send-iq jc nil
 		  "set"
 		  `(query ((xmlns . "http://jabber.org/protocol/disco#items")
-			   ,(when node `(node . ,node)))
+			   ,@(when node `((node . ,node))))
 			  (item ((action . "update")
 				 (jid . ,item-jid)
-				 ,(when item-name
-				    `(name . ,item-name))
-				 ,(when item-node
-				    `(node . ,item-node)))))
+				 ,@(when item-name
+				     `((name . ,item-name)))
+				 ,@(when item-node
+				     `((node . ,item-node))))))
 		  'jabber-report-success "Disco publish"
 		  'jabber-report-success "Disco publish"))
 
@@ -152,11 +152,11 @@ invalidate cache and get fresh data."
   (jabber-send-iq jc nil
 		  "set"
 		  `(query ((xmlns . "http://jabber.org/protocol/disco#items")
-			   ,(when node `(node . ,node)))
+			   ,@(when node `((node . ,node))))
 			  (item ((action . "remove")
 				 (jid . ,item-jid)
-				 ,(when item-node
-				    `(node . ,item-node)))))
+				 ,@(when item-node
+				     `((node . ,item-node))))))
 		  'jabber-report-success "Disco removal"
 		  'jabber-report-success "Disco removal"))
 

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

Summary of changes:
 jabber-newdisco.el |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
emacs-jabber