|
From: Magnus H. <leg...@us...> - 2013-01-28 01:01:02
|
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 c03c1f8d897d062591a661c7ac4f155355aa841f (commit)
via 422cf215b66e9610b0adc39591ad69533be49eb7 (commit)
via c05eefdf5f048ccba0f88d8cde5ebff9a477af94 (commit)
via 58cc4ecc28ba23c96b50b6730d9d88ed5c388bbb (commit)
from 2810cac3780f7e2fec3d43264699aca3473951d4 (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 c03c1f8d897d062591a661c7ac4f155355aa841f
Author: Magnus Henoch <mag...@gm...>
Date: Mon Jan 28 00:46:58 2013 +0000
jabber-ping.el: require jabber-menu
Needs jabber-jid-info-menu.
diff --git a/jabber-ping.el b/jabber-ping.el
index 50b6257..6afce8e 100644
--- a/jabber-ping.el
+++ b/jabber-ping.el
@@ -20,6 +20,7 @@
(require 'jabber-iq)
(require 'jabber-util)
+(require 'jabber-menu)
(add-to-list 'jabber-jid-info-menu
(cons "Ping" 'jabber-ping))
commit 422cf215b66e9610b0adc39591ad69533be49eb7
Author: Magnus Henoch <mag...@gm...>
Date: Sun Sep 16 19:29:26 2012 +0100
"Authentication succeeded" message to mention which account
diff --git a/jabber-sasl.el b/jabber-sasl.el
index d7992b1..d906933 100644
--- a/jabber-sasl.el
+++ b/jabber-sasl.el
@@ -127,7 +127,7 @@ Call REMEMBER with the password. REMEMBER is expected to return it as well."
(fsm-send jc :authentication-failure))
((eq (car xml-data) 'success)
- (message "Authentication succeeded")
+ (message "Authentication succeeded for %s" (jabber-connection-bare-jid jc))
(fsm-send jc (cons :authentication-success passphrase))))
(list client step passphrase)))
commit c05eefdf5f048ccba0f88d8cde5ebff9a477af94
Author: Magnus Henoch <mag...@gm...>
Date: Sun Sep 16 19:28:51 2012 +0100
Update docstring for how to hide offline contacts permanently
diff --git a/jabber-roster.el b/jabber-roster.el
index f983dbc..b62b182 100644
--- a/jabber-roster.el
+++ b/jabber-roster.el
@@ -498,7 +498,8 @@ such.")
buddies))
(defun jabber-roster-toggle-offline-display ()
- "Toggle display of offline contacts."
+ "Toggle display of offline contacts.
+To change this permanently, customize the `jabber-show-offline-contacts'."
(interactive)
(setq jabber-show-offline-contacts
(not jabber-show-offline-contacts))
commit 58cc4ecc28ba23c96b50b6730d9d88ed5c388bbb
Author: Magnus Henoch <mag...@gm...>
Date: Sun Sep 16 19:28:03 2012 +0100
jabber-disconnect: Display "Already disconnected" if that is the case
diff --git a/jabber-core.el b/jabber-core.el
index c7999e3..32597fc 100644
--- a/jabber-core.el
+++ b/jabber-core.el
@@ -788,14 +788,16 @@ With double prefix argument, specify more connection details."
(jabber-disconnect-one (jabber-read-account))
(unless *jabber-disconnecting* ; avoid reentry
(let ((*jabber-disconnecting* t))
- (run-hooks 'jabber-pre-disconnect-hook)
- (dolist (c jabber-connections)
- (jabber-disconnect-one c t))
- (setq jabber-connections nil)
-
- (jabber-disconnected)
- (when (interactive-p)
- (message "Disconnected from Jabber server(s)"))))))
+ (if (null jabber-connections)
+ (message "Already disconnected")
+ (run-hooks 'jabber-pre-disconnect-hook)
+ (dolist (c jabber-connections)
+ (jabber-disconnect-one c t))
+ (setq jabber-connections nil)
+
+ (jabber-disconnected)
+ (when (interactive-p)
+ (message "Disconnected from Jabber server(s)")))))))
(defun jabber-disconnect-one (jc &optional dont-redisplay)
"Disconnect from one Jabber server.
-----------------------------------------------------------------------
Summary of changes:
jabber-core.el | 18 ++++++++++--------
jabber-ping.el | 1 +
jabber-roster.el | 3 ++-
jabber-sasl.el | 2 +-
4 files changed, 14 insertions(+), 10 deletions(-)
hooks/post-receive
--
emacs-jabber
|