emacs-jabber jabber-presence.el,1.35,1.36

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv13686

Modified Files:
	jabber-presence.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-418
Creator:  Magnus Henoch <ma...@fr...>

Clarify roster push source address error message


Index: jabber-presence.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-presence.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- jabber-presence.el	17 Sep 2007 12:26:16 -0000	1.35
+++ jabber-presence.el	19 Sep 2007 09:06:45 -0000	1.36
@@ -50,7 +50,9 @@
     (if (not (or (null from)
 		 (string= from (concat username "@" server))
 		 (string= from (concat username "@" server "/" resource))))
-	(message "Roster push with invalid \"from\": \"%s\"" from)
+	(message "Roster push with invalid \"from\": \"%s\" (expected \"%s@%s\" or \"%s@%s/%s\")"
+		 from
+		 username server username server resource)
 
       (dolist (item (jabber-xml-get-children (car (jabber-xml-get-children xml-data 'query)) 'item))
 	(let (roster-item