[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kopete/protocols/jabber
From:       Till Gerken <till () tantalo ! net>
Date:       2002-12-07 3:13:14
[Download RAW message or body]

CVS commit by gerken: 

Make sure presence information is gathered after having received the roster


  M +7 -3      jabberprotocol.cpp   1.106


--- kdenonbeta/kopete/protocols/jabber/jabberprotocol.cpp:1.105	Wed Dec  4 21:49:24 2002
@@ -328,11 +328,15 @@
 
 		statusBarIcon->setPixmap(onlineIcon);
 
-		// since we are online now, set initial presence
-		setPresence(initialPresence, myContact->reason());
-		
 		// request roster
 		jabberClient->rosterRequest();
+
+		// since we are online now, set initial presence
+		// don't do this before the roster request or we will receive
+		// presence information before we have updated our roster
+		// with actual contacts from the server! (libpsi won't forward
+		// presence information in that case either)
+		setPresence(initialPresence, myContact->reason());
 
 		// initiate anti-idle timer (will be triggered every 10 seconds)
 		jabberClient->setNoopTime(10000);

[prev in list] [next in list] [prev in thread] [next in thread]