changeset 25954:f2d533384535

Updated a comment to describe what the actually does Removed a comment about initial presence
author Marcus Lundblad <ml@update.uu.se>
date Thu, 25 Dec 2008 13:21:27 +0000
parents cf29591fe78a
children fb3e9bff199e
files libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/presence.c
diffstat 2 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c	Thu Dec 25 10:48:49 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Thu Dec 25 13:21:27 2008 +0000
@@ -1638,10 +1638,9 @@
 							jbir->idle_seconds = sec;
 						}
 					}
-                    /* if this idle time different from the one stored
-                     in the JabberBuddyResource (as obtained via
-                     <presence/>) update it. This is to correct the value
-                     when a server doesn't mark delayed presence */
+                    /* Update the idle time of the buddy resource, if we got it. 
+                     This will correct the value when a server doesn't mark 
+                     delayed presence and we got the presence when signing on */
                     jb = jabber_buddy_find(js, from, FALSE);
                     if (jb) {
                         resource = jabber_get_resource(from);
--- a/libpurple/protocols/jabber/presence.c	Thu Dec 25 10:48:49 2008 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu Dec 25 13:21:27 2008 +0000
@@ -424,11 +424,6 @@
 	g_free(userdata);
 }
 
-/* would need to add some detection to determine if a
- <presence/> packet is part of the "initial" presence the server
- sends us, this way we could disregard a buddy's idle time in case the server
- does not set <delayed/> on delayed presence. This would avoid 
- showing an incorrect idle time */
 void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 {
 	const char *from = xmlnode_get_attrib(packet, "from");