emacs-jabber jabber-core.el,1.92,1.93

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

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

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

Run jabber-pre-disconnect-hook in jabber-disconnect


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- jabber-core.el	16 Aug 2008 21:57:56 -0000	1.92
+++ jabber-core.el	26 Aug 2008 01:17:15 -0000	1.93
@@ -741,21 +741,21 @@
   (interactive "P")
   (if arg
       (jabber-disconnect-one (jabber-read-account))
-      (unless *jabber-disconnecting*	; avoid reentry
-    (let ((*jabber-disconnecting* t))
-      (dolist (c jabber-connections)
-	(jabber-disconnect-one c t))
-      (setq jabber-connections nil)
+    (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)"))))))
+	(jabber-disconnected)
+	(when (interactive-p)
+	  (message "Disconnected from Jabber server(s)"))))))
 
 (defun jabber-disconnect-one (jc &optional dont-redisplay)
   "Disconnect from one Jabber server.
 If DONT-REDISPLAY is non-nil, don't update roster buffer."
   (interactive (list (jabber-read-account)))
-  ;;(run-hooks 'jabber-pre-disconnect-hook)
   (fsm-send-sync jc :do-disconnect)
   (when (interactive-p)
     (message "Disconnected from %s"