emacs-jabber jabber-core.el,1.82,1.83

[Evgenii T. <evg...@us...>]

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

Modified Files:
	jabber-core.el 
Log Message:
Fix for C-u C-x C-j C-c
C-u C-x C-j C-d now call jabber-disconnect-one


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- jabber-core.el	20 Feb 2008 01:48:46 -0000	1.82
+++ jabber-core.el	23 Feb 2008 17:51:27 -0000	1.83
@@ -134,7 +134,7 @@
 		      (cdr (assq :disabled (cdr account))))
 		    jabber-account-list)))
     (if (or (null accounts) arg)
-	(call-interactively 'jabber-connect)
+	(progn (setq current-prefix-arg nil) (call-interactively 'jabber-connect))
       ;; Only connect those accounts that are not yet connected.
       (let ((already-connected (mapcar #'jabber-connection-bare-jid jabber-connections))
 	    (connected-one nil))
@@ -696,10 +696,12 @@
      (list nil (plist-put state-data
 			  :disconnection-expected t)))))
 
-(defun jabber-disconnect ()
-  "Disconnect from all Jabber servers."
-  (interactive)
-  (unless *jabber-disconnecting*	; avoid reentry
+(defun jabber-disconnect (&optional arg)
+  "Disconnect from all Jabber servers. If ARG supplied, disconnect one account."
+  (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))
@@ -707,7 +709,7 @@
 
       (jabber-disconnected)
       (when (interactive-p)
-	(message "Disconnected from Jabber server(s)")))))
+	(message "Disconnected from Jabber server(s)"))))))
 
 (defun jabber-disconnect-one (jc &optional dont-redisplay)
   "Disconnect from one Jabber server.