rev 284 - trunk/msn

Author: mrowe
Date: 2004-10-15 16:38:38 +1300 (Fri, 15 Oct 2004)
New Revision: 284

Modified:
   trunk/msn/notificationserver.cpp
   trunk/msn/switchboardserver.cpp
Log:
If the socket connection is blocking then we will be connected by the time that 
connectToServer returns.  We should handle that case nicely.

Modified: trunk/msn/notificationserver.cpp
===================================================================
--- trunk/msn/notificationserver.cpp    2004-10-15 03:27:23 UTC (rev 283)
+++ trunk/msn/notificationserver.cpp    2004-10-15 03:38:38 UTC (rev 284)
@@ -493,6 +493,8 @@
         }
         connectionStatus = NS_CONNECTING;
         
this->myNotificationServer()->externalCallbacks.registerSocket(this->sock, 0, 
1);
+        if (this->connected)
+            this->socketConnectionCompleted();
         
         std::ostringstream buf_;
         buf_ << "VER " << trid << " MSNP8\r\n";

Modified: trunk/msn/switchboardserver.cpp
===================================================================
--- trunk/msn/switchboardserver.cpp     2004-10-15 03:27:23 UTC (rev 283)
+++ trunk/msn/switchboardserver.cpp     2004-10-15 03:38:38 UTC (rev 284)
@@ -309,6 +309,10 @@
         
         
this->myNotificationServer()->externalCallbacks.registerSocket(this->sock, 1, 
1);
         connectionStatus = SB_CONNECTING;
+        
+        if (this->connected)
+            this->socketConnectionCompleted();
+        
         std::ostringstream buf_;
         if (this->auth.sessionID.empty())
         {



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl