From 58cc4ecc28ba23c96b50b6730d9d88ed5c388bbb Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Sun, 16 Sep 2012 19:28:03 +0100 Subject: [PATCH] jabber-disconnect: Display "Already disconnected" if that is the case --- jabber-core.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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) + (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)")))))) + (jabber-disconnected) + (when (interactive-p) + (message "Disconnected from Jabber server(s)"))))))) (defun jabber-disconnect-one (jc &optional dont-redisplay) "Disconnect from one Jabber server.