Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9988
Modified Files:
jabber-core.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-452
Creator: Magnus Henoch <ma...@fr...>
Only reconnect if we ever had a successful connection
Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- jabber-core.el 20 Feb 2008 01:43:15 -0000 1.81
+++ jabber-core.el 20 Feb 2008 01:48:46 -0000 1.82
@@ -255,7 +255,8 @@
;; Remove lost connections from the roster buffer.
(jabber-display-roster)
(let ((expected (plist-get state-data :disconnection-expected))
- (reason (plist-get state-data :disconnection-reason)))
+ (reason (plist-get state-data :disconnection-reason))
+ (ever-session-established (plist-get state-data :ever-session-established)))
(unless expected
(run-hooks 'jabber-lost-connection-hook)
(message "%s@%s/%s: connection lost: `%s'"
@@ -264,7 +265,7 @@
(plist-get state-data :resource)
reason))
- (if (and jabber-auto-reconnect (not expected))
+ (if (and jabber-auto-reconnect (not expected) ever-session-established)
;; Reconnect after a short delay?
(list state-data jabber-reconnect-delay)
;; Else the connection is really dead. Remove it from the list
@@ -662,7 +663,7 @@
'(query ((xmlns . "jabber:iq:roster")))
#'jabber-process-roster 'initial
#'jabber-report-success "Roster retrieval")
- (list state-data nil))
+ (list (plist-put state-data :ever-session-established t) nil))
(define-state jabber-connection :session-established
(fsm state-data event callback)
|
