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

[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  e1c008cfb95202720613bcdb361dec86aa855285 (commit)
      from  0951030fa43fdb6df1d046cded631018be578e7b (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 e1c008cfb95202720613bcdb361dec86aa855285
Author: Magnus Henoch <mag...@gm...>
Date:   Wed Aug 27 10:36:58 2014 +0100

    Compare nickname as well to find MUC self-presence
    
    Not all MUC servers send 110 status codes.

diff --git a/jabber-muc.el b/jabber-muc.el
index 9a8bd97..19b912d 100644
--- a/jabber-muc.el
+++ b/jabber-muc.el
@@ -1090,8 +1090,18 @@ Return nil if X-MUC is nil."
      (t 
       ;; someone is entering
 
-      (when (member "110" status-codes)
+      (when (or (member "110" status-codes) (string= nickname our-nickname))
 	;; This is us.  We just succeeded in entering the room.
+	;;
+	;; The MUC server is supposed to send a 110 code whenever this
+	;; is our presence ("self-presence"), but at least one
+	;; (ejabberd's mod_irc) doesn't, so check the nickname as well.
+	;;
+	;; This check might give incorrect results if the server
+	;; changed our nickname to avoid collision with an existing
+	;; participant, but even in this case the window where we have
+	;; incorrect information should be very small, as we should be
+	;; getting our own 110+210 presence shortly.
 	(let ((whichgroup (assoc group *jabber-active-groupchats*)))
 	  (if whichgroup
 	      (setcdr whichgroup nickname)

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

Summary of changes:
 jabber-muc.el |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
emacs-jabber