Conflicts:

src/lib/server/ClientListener.cpp

src/lib/base/EventTypes.cpp

@@ -108,6 +108,7 @@ REGISTER_EVENT(OSXScreen, confirmSleep)
 // ClientListener
 //
 
+REGISTER_EVENT(ClientListener, accepted)
 REGISTER_EVENT(ClientListener, connected)
 
 //

src/lib/base/EventTypes.h

@@ -337,11 +337,19 @@ private:
 class ClientListenerEvents : public EventTypes {
 public:
 	ClientListenerEvents() :
+		m_accepted(Event::kUnknown),
 		m_connected(Event::kUnknown) { }
 
 	//! @name accessors
 	//@{
-		
+	
+	//! Get accepted event type
+	/*!
+	 Returns the accepted event type.  This is sent whenever a server
+	 accepts a client.
+	 */
+	Event::Type		accepted();
+	
 	//! Get connected event type
 	/*!
 	Returns the connected event type.  This is sent whenever a
@@ -352,6 +360,7 @@ public:
 	//@}
 
 private:
+	Event::Type		m_accepted;
 	Event::Type		m_connected;
 };