emacs-jabber jabber-muc.el,1.72,1.73

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27810

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

Handle MUC errors from bare room JID


Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- jabber-muc.el	19 Sep 2007 09:06:37 -0000	1.72
+++ jabber-muc.el	8 Feb 2008 19:11:57 -0000	1.73
@@ -1,6 +1,6 @@
 ;; jabber-muc.el - advanced MUC functions
 
-;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2003, 2004, 2007, 2008 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
 
 ;; This file is a part of jabber.el.
@@ -879,8 +879,9 @@
     ;; handle leaving a room
     (cond 
      ((or (string= type "unavailable") (string= type "error"))
-      ;; are we leaving?
-      (if (string= nickname (gethash (jabber-jid-symbol group) jabber-pending-groupchats))
+      ;; error from room itself? or are we leaving?
+      (if (or (null nickname)
+	      (string= nickname (gethash (jabber-jid-symbol group) jabber-pending-groupchats)))
 	  (let ((message (cond
 			  ((string= type "error")
 			   (concat "Error entering room"