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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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  a4f4e0cab47112eff471bcb4d81dbb2e6bf8b320 (commit)
       via  bb8eeb204fa7589c012dc89f2c033114e7e8579f (commit)
       via  45ca35f79c1939f4aaae01127b39abca9ab1f361 (commit)
       via  bd570587473cf1bf36eea6b57ba8599f43b2e74c (commit)
       via  a5b70ebd8318999582b86794f689c2c34350f42b (commit)
       via  0eb94afdee276959edb8e00b99af8bc708eeb8e3 (commit)
       via  f22c8656ea330c0dba4811805b0c3ec1363298f1 (commit)
       via  efeab97bc18e42322693852605aeaa74839b0531 (commit)
       via  ebce8529c30fb554b3d0df830319653445accbc8 (commit)
       via  71d66edb4cedba59e98fcc43d0f1879eedac0e70 (commit)
       via  cf89a44b68736638763d877aef5b067adbee2986 (commit)
       via  b0e517f27086b27ffb522549e36b5a536ac063ff (commit)
       via  3fc929628606d988e5a41cac9d5941c87a23ae26 (commit)
       via  0b40a35043e7f6fb256411c2b9287b820c6d7ec1 (commit)
       via  74a98f3da67f3f438889eb801ea49237a9ea1003 (commit)
       via  d1732df73a4c192761ba137a3a6dca1cc8128b9e (commit)
       via  ccd6e4a596aba77bf7ba2759068e937c01453d42 (commit)
       via  2b55c4ebd07ed40f741e7c10c02d9dc253f45fd3 (commit)
      from  d11bda5e659ceb4d17b33ac0df78dfb6a6f27625 (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 a4f4e0cab47112eff471bcb4d81dbb2e6bf8b320
Merge: bb8eeb2 d11bda5
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Nov 30 12:25:35 2013 +0000

    Merge remote-tracking branch 'refs/remotes/origin/master'


commit bb8eeb204fa7589c012dc89f2c033114e7e8579f
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Nov 30 12:23:06 2013 +0000

    Use original JID when choosing which accounts to reconnect
    
    Some Jabber servers (notably Facebook Chat) assign a different JID at
    resource binding.  This used to confuse jabber-connect-all, such that it
    would establish a new connection although the existing one is perfectly
    healthy.
    
    With this change, we save the JID that we originally connected with, and
    use that to avoid duplicate connections.

diff --git a/jabber-core.el b/jabber-core.el
index 32597fc..7b7386b 100644
--- a/jabber-core.el
+++ b/jabber-core.el
@@ -171,7 +171,7 @@ With many prefix arguments, one less is passed to `jabber-connect'."
 		 arg))))
 	  (call-interactively 'jabber-connect))
       ;; Only connect those accounts that are not yet connected.
-      (let ((already-connected (mapcar #'jabber-connection-bare-jid jabber-connections))
+      (let ((already-connected (mapcar #'jabber-connection-original-jid jabber-connections))
 	    (connected-one nil))
 	(dolist (account accounts)
 	  (unless (member (jabber-jid-user (car account)) already-connected)
@@ -277,6 +277,8 @@ With double prefix argument, specify more connection details."
 
 	    (list :connecting 
 		  (list :send-function send-function
+			;; Save the JID we originally connected with.
+			:original-jid (concat username "@" server)
 			:username username
 			:server server
 			:resource resource
diff --git a/jabber-util.el b/jabber-util.el
index c4b8a97..0c867df 100644
--- a/jabber-util.el
+++ b/jabber-util.el
@@ -145,6 +145,13 @@ properties to add to the result."
     (concat (plist-get sd :username) "@"
 	    (plist-get sd :server))))
 
+(defun jabber-connection-original-jid (jc)
+  "Return the original JID of the given connection.
+The \"original JID\" is the JID we authenticated with.  The
+server might subsequently assign us a different JID at resource
+binding."
+  (plist-get (fsm-get-state-data jc) :original-jid))
+
 (defun jabber-find-connection (bare-jid)
   "Find the connection to the account named by BARE-JID.
 Return nil if none found."

commit 45ca35f79c1939f4aaae01127b39abca9ab1f361
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Nov 30 12:19:00 2013 +0000

    Include JID in authentication failure message

diff --git a/jabber-sasl.el b/jabber-sasl.el
index d906933..ce3fc2e 100644
--- a/jabber-sasl.el
+++ b/jabber-sasl.el
@@ -122,7 +122,8 @@ Call REMEMBER with the password.  REMEMBER is expected to return it as well."
 		     (base64-encode-string (sasl-step-data step) t)))))
 
      ((eq (car xml-data) 'failure)
-      (message "SASL authentication failure: %s"
+      (message "%s: authentication failure: %s"
+	       (jabber-connection-bare-jid jc)
 	       (jabber-xml-node-name (car (jabber-xml-node-children xml-data))))
       (fsm-send jc :authentication-failure))
 

commit bd570587473cf1bf36eea6b57ba8599f43b2e74c
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Nov 30 12:18:01 2013 +0000

    Suppress superfluous <active/> chat state after sending message

diff --git a/jabber-chatstates.el b/jabber-chatstates.el
index 3b8d0a5..0cdc3d1 100644
--- a/jabber-chatstates.el
+++ b/jabber-chatstates.el
@@ -72,6 +72,7 @@ nil - don't send states")
       ;; don't send more notifications until we know that the other
       ;; side wants them.
       (setq jabber-chatstates-requested nil))
+    (setq jabber-chatstates-composing-sent nil)
     `((active ((xmlns . ,jabber-chatstates-xmlns))))))
 
 ;;; OUTGOING

commit a5b70ebd8318999582b86794f689c2c34350f42b
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Nov 30 12:17:26 2013 +0000

    Suppress message when writing avatar to cache

diff --git a/jabber-avatar.el b/jabber-avatar.el
index 8a956ba..e3dcbca 100644
--- a/jabber-avatar.el
+++ b/jabber-avatar.el
@@ -157,24 +157,21 @@ If there is no cached image, return nil."
   (let* ((id (avatar-sha1-sum avatar))
 	 (base64-data (avatar-base64-data avatar))
 	 (mime-type (avatar-mime-type avatar))
-	 (filename (expand-file-name id jabber-avatar-cache-directory))
-	 (buffer (create-file-buffer filename)))
+	 (filename (expand-file-name id jabber-avatar-cache-directory)))
     (unless (file-directory-p jabber-avatar-cache-directory)
       (make-directory jabber-avatar-cache-directory t))
 
     (if (file-exists-p filename)
 	(when jabber-avatar-verbose
 	  (message "Caching avatar, but %s already exists" filename))
-      (with-current-buffer buffer
-	(let ((require-final-newline nil))
-	  (setq buffer-file-coding-system 'binary)
+      (with-temp-buffer
+	(let ((require-final-newline nil)
+	      (coding-system-for-write 'binary))
 	  (if (fboundp 'set-buffer-multibyte)
 	      (set-buffer-multibyte nil))
-	  (set-visited-file-name filename t)
 	  (insert base64-data)
 	  (base64-decode-region (point-min) (point-max))
-	  (basic-save-buffer))))
-    (kill-buffer buffer)))
+	  (write-region (point-min) (point-max) filename nil 'silent))))))
 
 ;;;; Set avatar for contact
 

commit 0eb94afdee276959edb8e00b99af8bc708eeb8e3
Merge: b5cb0d6 f22c865
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Nov 30 11:13:42 2013 +0000

    Merge branch 'rtt'


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

Summary of changes:
 Makefile.am           |    2 +-
 jabber-ahc.el         |    2 +-
 jabber-avatar.el      |   13 +-
 jabber-chat.el        |   10 +-
 jabber-chatstates.el  |    3 +-
 jabber-core.el        |    4 +-
 jabber-disco.el       |  538 +++++++++++++++++++++++++++++++++++++++++++-----
 jabber-feature-neg.el |    2 +-
 jabber-ft-server.el   |    2 +-
 jabber-muc.el         |    2 +-
 jabber-newdisco.el    |  165 ---------------
 jabber-ping.el        |    2 +-
 jabber-rtt.el         |  319 +++++++++++++++++++++++++++++
 jabber-sasl.el        |    3 +-
 jabber-si-server.el   |    2 +-
 jabber-socks5.el      |    3 +-
 jabber-time.el        |    6 +-
 jabber-util.el        |    7 +
 jabber-version.el     |    2 +-
 jabber-widget.el      |    2 +-
 20 files changed, 842 insertions(+), 247 deletions(-)
 delete mode 100644 jabber-newdisco.el
 create mode 100644 jabber-rtt.el


hooks/post-receive
-- 
emacs-jabber


