[SCM] emacs-jabber branch, master, updated. d30ef9b989065f6e714cf1781bbd0e7e4039681c

[Evgenii T. <evg...@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  d30ef9b989065f6e714cf1781bbd0e7e4039681c (commit)
      from  10c065380f088e65d6ad81595b68ecd6f084c471 (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 d30ef9b989065f6e714cf1781bbd0e7e4039681c
Author: Evgenii Terechkov <ev...@al...>
Date:   Tue Oct 19 23:41:05 2010 +0800

    Work around broken stanzas from some transports

diff --git a/jabber-muc.el b/jabber-muc.el
index d342905..d717bd9 100644
--- a/jabber-muc.el
+++ b/jabber-muc.el
@@ -500,13 +500,17 @@ groupchat buffer."
 	)
        ;; Maybe another error occurred. Report it to user
        (condition
-	(message "Couldn't query groupchat: %s" (jabber-parse-error result))))
+	(message "Couldn't query groupchat: %s" (jabber-parse-error result)))
+
+       ;; Bad stanza? Without NS, for example
+       ((and (eq identities 'error) (not condition))
+        (message "Bad error stanza received")))
 
       ;; Continue only if it is really chat room.  If there was an
       ;; error, give the chat room the benefit of the doubt.  (Needed
       ;; for ejabberd's mod_irc, for example)
       (when (or condition
-                (find "conference" identities 
+                (find "conference" (if (sequencep identities) identities nil)
                       :key (lambda (i) (aref i 1))
                       :test #'string=))
         (let ((password

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

Summary of changes:
 jabber-muc.el |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
emacs-jabber