rev 193 - branches/libmsn-3.1.x/msn

Author: mrowe
Date: 2004-06-25 02:30:38 +1200 (Fri, 25 Jun 2004)
New Revision: 193

Modified:
   branches/libmsn-3.1.x/msn/notificationserver.h
   branches/libmsn-3.1.x/msn/switchboardserver.h
Log:
Merge [192] from trunk to 3.1.x branch.

Modified: branches/libmsn-3.1.x/msn/notificationserver.h
===================================================================
--- branches/libmsn-3.1.x/msn/notificationserver.h      2004-06-24 14:29:18 UTC 
(rev 192)
+++ branches/libmsn-3.1.x/msn/notificationserver.h      2004-06-24 14:30:38 UTC 
(rev 193)
@@ -273,17 +273,21 @@
         
         virtual void socketConnectionCompleted();
         
-protected:
-        virtual void handleIncomingData();
-        enum
+        
+        enum NotificationServerState
         {
             NS_DISCONNECTED,
             NS_CONNECTING,
             NS_CONNECTED,
             NS_SYNCHRONISING,
             NS_ONLINE
-        } connectionStatus;
+        };
 
+        NotificationServerState connectionState() const { return 
this->connectionStatus; };
+protected:
+        virtual void handleIncomingData();
+        NotificationServerState connectionStatus;
+
 private:
         std::list<SwitchboardServerConnection *> _switchboardConnections;
         std::map<int, std::pair<NotificationServerCallback, void *> > 
callbacks;

Modified: branches/libmsn-3.1.x/msn/switchboardserver.h
===================================================================
--- branches/libmsn-3.1.x/msn/switchboardserver.h       2004-06-24 14:29:18 UTC 
(rev 192)
+++ branches/libmsn-3.1.x/msn/switchboardserver.h       2004-06-24 14:30:38 UTC 
(rev 193)
@@ -131,15 +131,20 @@
         Invitation *invitationWithCookie(const std::string & cookie);
         
         virtual void socketConnectionCompleted();
-protected:
-        virtual void handleIncomingData();
-        enum {
+        
+        enum SwitchboardServerState
+        {
             SB_DISCONNECTED,
             SB_CONNECTING,
             SB_CONNECTED,            
             SB_WAITING_FOR_USERS,
             SB_READY
-        } connectionStatus;
+        };
+        
+        SwitchboardServerState connectionState() const { return 
this->connectionStatus; };
+protected:
+        virtual void handleIncomingData();
+        SwitchboardServerState connectionStatus;
 private:
         NotificationServerConnection & notificationServer;
         std::list<FileTransferConnection *> _fileTransferConnections;



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com