emacs-jabber jabber-presence.el,1.41,1.42

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

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

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

Flush contact information on initial roster push


Index: jabber-presence.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-presence.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- jabber-presence.el	13 Jan 2008 18:05:21 -0000	1.41
+++ jabber-presence.el	13 Jan 2008 18:13:15 -0000	1.42
@@ -76,6 +76,15 @@
 	      (setq roster-item jid)
 	      (push roster-item new-items))
 
+	    ;; If this is an initial push, we want to forget
+	    ;; everything we knew about this contact before - e.g. if
+	    ;; the contact was online when we disconnected and offline
+	    ;; when we reconnect, we don't want to see stale presence
+	    ;; information.  This assumes that no contacts are shared
+	    ;; between accounts.
+	    (when (eq closure-data 'initial)
+	      (setplist roster-item nil))
+
 	    ;; Now, get all data associated with the contact.
 	    (put roster-item 'name (jabber-xml-get-attribute item 'name))
 	    (put roster-item 'subscription (jabber-xml-get-attribute item 'subscription))