1 files changed, 223 insertions, 223 deletions
diff --git a/protocols/Skype/src/skype_subclassing.cpp b/protocols/Skype/src/skype_subclassing.cpp
index 3dbf36d12b..0058f0a5a5 100644
--- a/protocols/Skype/src/skype_subclassing.cpp
+++ b/protocols/Skype/src/skype_subclassing.cpp
@@ -1,38 +1,38 @@
-#include "skype_subclassing.h"
-
-// CSkype
-
-CSkype::CSkype(int num_threads) : Skype(num_threads)
-{
-	this->proto = NULL;
-	this->callback == NULL;
-}
-
-CAccount* CSkype::newAccount(int oid) 
-{ 
-	return new CAccount(oid, this); 
-}
-
-CContactGroup* CSkype::newContactGroup(int oid)
-{ 
-	return new CContactGroup(oid, this); 
-}
-
-CContact* CSkype::newContact(int oid) 
-{ 
-	return new CContact(oid, this); 
-}
-
-CConversation* CSkype::newConversation(int oid) 
-{ 
-	return new CConversation(oid, this); 
-}
-
-CContactSearch*	CSkype::newContactSearch(int oid)
-{
-	return new CContactSearch(oid, this);
-}
-
+#include "skype_subclassing.h"
+
+// CSkype
+
+CSkype::CSkype(int num_threads) : Skype(num_threads)
+{
+	this->proto = NULL;
+	this->callback == NULL;
+}
+
+CAccount* CSkype::newAccount(int oid) 
+{ 
+	return new CAccount(oid, this); 
+}
+
+CContactGroup* CSkype::newContactGroup(int oid)
+{ 
+	return new CContactGroup(oid, this); 
+}
+
+CContact* CSkype::newContact(int oid) 
+{ 
+	return new CContact(oid, this); 
+}
+
+CConversation* CSkype::newConversation(int oid) 
+{ 
+	return new CConversation(oid, this); 
+}
+
+CContactSearch*	CSkype::newContactSearch(int oid)
+{
+	return new CContactSearch(oid, this);
+}
+
 void CSkype::OnConversationListChange(
 	const ConversationRef &conversation, 
 	const Conversation::LIST_TYPE &type, 
@@ -45,193 +45,193 @@ void CSkype::OnConversationListChange(
 		if (this->proto)
 			(proto->*callback)(conversation->ref());
 	}
-}
-
-void CSkype::SetOnConversationAddedCallback(OnConversationAdded callback, CSkypeProto* proto)
-{
-	this->proto = proto;
-	this->callback = callback;
-}
-
-// CAccount
-
-CAccount::CAccount(unsigned int oid, SERootObject* root) : Account(oid, root) 
-{
-	this->isLoggedIn = false;
-	this->isLoggedOut = false;
-
-	this->proto = NULL;
-	this->callback == NULL;
-}
-
-void CAccount::SetOnAccountChangedCallback(OnAccountChanged callback, CSkypeProto* proto)
-{
-	this->proto = proto;
-	this->callback = callback;
-}
-
-void CAccount::OnChange(int prop)
-{
-  if (prop == CAccount::P_STATUS)
-  {
-	  CAccount::STATUS loginStatus;
-	  this->GetPropStatus(loginStatus);
-	  if (loginStatus == CAccount::LOGGED_IN)  
-		  this->isLoggedIn = true;
-		
-		if (loginStatus == CAccount::LOGGED_OUT) 
-		{ 
-			CAccount::LOGOUTREASON whyLogout;
-			this->GetPropLogoutreason(whyLogout);
-			this->logoutReason = whyLogout;
-			if (whyLogout != Account::LOGOUT_CALLED)
-			{
-				// todo: rewrite!!
-				strcpy(this->logoutReasonString, (const char*)tostring(whyLogout));
-			}
-			this->isLoggedIn = false;
-			this->isLoggedOut = true;
+}
+
+void CSkype::SetOnConversationAddedCallback(OnConversationAdded callback, CSkypeProto* proto)
+{
+	this->proto = proto;
+	this->callback = callback;
+}
+
+// CAccount
+
+CAccount::CAccount(unsigned int oid, SERootObject* root) : Account(oid, root) 
+{
+	this->isLoggedIn = false;
+	this->isLoggedOut = false;
+
+	this->proto = NULL;
+	this->callback == NULL;
+}
+
+void CAccount::SetOnAccountChangedCallback(OnAccountChanged callback, CSkypeProto* proto)
+{
+	this->proto = proto;
+	this->callback = callback;
+}
+
+void CAccount::OnChange(int prop)
+{
+  if (prop == CAccount::P_STATUS)
+  {
+	  CAccount::STATUS loginStatus;
+	  this->GetPropStatus(loginStatus);
+	  if (loginStatus == CAccount::LOGGED_IN)  
+		  this->isLoggedIn = true;
+		
+		if (loginStatus == CAccount::LOGGED_OUT) 
+		{ 
+			CAccount::LOGOUTREASON whyLogout;
+			this->GetPropLogoutreason(whyLogout);
+			this->logoutReason = whyLogout;
+			if (whyLogout != Account::LOGOUT_CALLED)
+			{
+				// todo: rewrite!!
+				strcpy(this->logoutReasonString, (const char*)tostring(whyLogout));
+			}
+			this->isLoggedIn = false;
+			this->isLoggedOut = true;
+		}
+	}
+  else
+  {
+	  if (this->proto)
+		  (proto->*callback)(prop);
+  }
+}
+
+void CAccount::BlockWhileLoggingIn()
+{
+	this->isLoggedIn = false;
+	this->isLoggedOut = false;
+	while (!this->isLoggedIn && !this->isLoggedOut) 
+		Sleep(1); 
+}
+
+void CAccount::BlockWhileLoggingOut()
+{
+	this->isLoggedOut = false;
+	while ( !this->isLoggedOut) 
+		Sleep(1);
+}
+
+bool CAccount::IsOnline()
+{
+	return this->isLoggedIn;
+		//(CAccount::STATUS)this->GetUintProp(CAccount::P_STATUS) == Account::LOGGED_IN;
+}
+
+// CContactGroup
+
+CContactGroup::CContactGroup(unsigned int oid, SERootObject* root) : ContactGroup(oid, root) 
+{
+	this->proto = NULL;
+	this->callback == NULL;
+}
+
+void CContactGroup::SetOnContactListChangedCallback(OnContactListChanged callback, CSkypeProto* proto)
+{
+	this->proto = proto;
+	this->callback = callback;
+}
+
+//bool CContactGroup::Contains(const ContactRef& contact)
+//{
+//	return this->ContactList.contains(contact);
+//}
+
+void CContactGroup::OnChange(const ContactRef& contact)
+{
+	if (this->proto)
+		(proto->*callback)(contact);
+}
+
+// CContactSearch
+
+CContactSearch::CContactSearch(unsigned int oid, SERootObject* root) : ContactSearch(oid, root)
+{
+	this->proto = NULL;
+	this->SearchCompletedCallback == NULL;
+	this->ContactFindedCallback == NULL;
+}
+
+void CContactSearch::OnChange(int prop)
+{
+	if (prop == P_CONTACT_SEARCH_STATUS)
+	{
+		CContactSearch::STATUS status;
+		this->GetPropContactSearchStatus(status);
+		if (status == FINISHED || status == FAILED)
+		{
+			this->isSeachFinished = true;
+			if (this->proto)
+				(proto->*SearchCompletedCallback)(this->hSearch);
 		}
-	}
-  else
-  {
-	  if (this->proto)
-		  (proto->*callback)(prop);
-  }
-}
-
-void CAccount::BlockWhileLoggingIn()
-{
-	this->isLoggedIn = false;
-	this->isLoggedOut = false;
-	while (!this->isLoggedIn && !this->isLoggedOut) 
-		Sleep(1); 
-}
-
-void CAccount::BlockWhileLoggingOut()
-{
-	this->isLoggedOut = false;
-	while ( !this->isLoggedOut) 
-		Sleep(1);
-}
-
-bool CAccount::IsOnline()
-{
-	return this->isLoggedIn;
-		//(CAccount::STATUS)this->GetUintProp(CAccount::P_STATUS) == Account::LOGGED_IN;
-}
-
-// CContactGroup
-
-CContactGroup::CContactGroup(unsigned int oid, SERootObject* root) : ContactGroup(oid, root) 
-{
-	this->proto = NULL;
-	this->callback == NULL;
-}
-
-void CContactGroup::SetOnContactListChangedCallback(OnContactListChanged callback, CSkypeProto* proto)
-{
-	this->proto = proto;
-	this->callback = callback;
-}
-
-//bool CContactGroup::Contains(const ContactRef& contact)
-//{
-//	return this->ContactList.contains(contact);
-//}
-
-void CContactGroup::OnChange(const ContactRef& contact)
-{
-	if (this->proto)
-		(proto->*callback)(contact);
-}
-
-// CContactSearch
-
-CContactSearch::CContactSearch(unsigned int oid, SERootObject* root) : ContactSearch(oid, root)
-{
-	this->proto = NULL;
-	this->SearchCompletedCallback == NULL;
-	this->ContactFindedCallback == NULL;
-}
-
-void CContactSearch::OnChange(int prop)
-{
-	if (prop == P_CONTACT_SEARCH_STATUS)
-	{
-		CContactSearch::STATUS status;
-		this->GetPropContactSearchStatus(status);
-		if (status == FINISHED || status == FAILED)
-		{
-			this->isSeachFinished = true;
-			if (this->proto)
-				(proto->*SearchCompletedCallback)(this->hSearch);
-		}
-	}
-
-	//SEString value = GetProp(prop);
-	//List_String dbg = getPropDebug(prop, value);
-	//fprintf(stdout,"CONTACTSEARCH.%d:%s = %s\n", getOID(), (const char*)dbg[1], (const char*)dbg[2]);
-}
-
-void CContactSearch::OnNewResult(const ContactRef& contact, const uint& rankValue)
-{
-	if (this->proto)
-		(proto->*ContactFindedCallback)(this->hSearch, contact->ref());
-}
-
-void CContactSearch::BlockWhileSearch()
-{
-	this->isSeachFinished = false;
-	this->isSeachFailed = false;
-	while (!this->isSeachFinished && !this->isSeachFailed) 
-		Sleep(1); 
-}
-
-void CContactSearch::SetProtoInfo(CSkypeProto* proto, HANDLE hSearch)
-{
-	this->proto = proto;
-	this->hSearch = hSearch;
-}
-
-void CContactSearch::SetOnSearchCompleatedCallback(OnSearchCompleted callback)
-{
-	this->SearchCompletedCallback = callback;
-}
-
-void CContactSearch::SetOnContactFindedCallback(OnContactFinded callback)
-{
-	this->ContactFindedCallback = callback;
-}
-
-// CContact
-
-CContact::CContact(unsigned int oid, SERootObject* root) : Contact(oid, root) 
-{
-	this->proto = NULL;
-	this->callback == NULL;
-}
-
-void CContact::SetOnContactChangedCallback(OnContactChanged callback, CSkypeProto* proto)
-{
-	this->proto = proto;
-	this->callback = callback;
-}
-
-void CContact::OnChange(int prop)
-{
-	if (this->proto)
-		(proto->*callback)(this->ref(), prop);
-}
-
-// Conversation
-
-CConversation::CConversation(unsigned int oid, SERootObject* root) : Conversation(oid, root) 
-{
-	this->proto = NULL;
-	this->callback == NULL;
-}
-
+	}
+
+	//SEString value = GetProp(prop);
+	//List_String dbg = getPropDebug(prop, value);
+	//fprintf(stdout,"CONTACTSEARCH.%d:%s = %s\n", getOID(), (const char*)dbg[1], (const char*)dbg[2]);
+}
+
+void CContactSearch::OnNewResult(const ContactRef& contact, const uint& rankValue)
+{
+	if (this->proto)
+		(proto->*ContactFindedCallback)(this->hSearch, contact->ref());
+}
+
+void CContactSearch::BlockWhileSearch()
+{
+	this->isSeachFinished = false;
+	this->isSeachFailed = false;
+	while (!this->isSeachFinished && !this->isSeachFailed) 
+		Sleep(1); 
+}
+
+void CContactSearch::SetProtoInfo(CSkypeProto* proto, HANDLE hSearch)
+{
+	this->proto = proto;
+	this->hSearch = hSearch;
+}
+
+void CContactSearch::SetOnSearchCompleatedCallback(OnSearchCompleted callback)
+{
+	this->SearchCompletedCallback = callback;
+}
+
+void CContactSearch::SetOnContactFindedCallback(OnContactFinded callback)
+{
+	this->ContactFindedCallback = callback;
+}
+
+// CContact
+
+CContact::CContact(unsigned int oid, SERootObject* root) : Contact(oid, root) 
+{
+	this->proto = NULL;
+	this->callback == NULL;
+}
+
+void CContact::SetOnContactChangedCallback(OnContactChanged callback, CSkypeProto* proto)
+{
+	this->proto = proto;
+	this->callback = callback;
+}
+
+void CContact::OnChange(int prop)
+{
+	if (this->proto)
+		(proto->*callback)(this->ref(), prop);
+}
+
+// Conversation
+
+CConversation::CConversation(unsigned int oid, SERootObject* root) : Conversation(oid, root) 
+{
+	this->proto = NULL;
+	this->callback == NULL;
+}
+
 void CConversation::OnMessage(const MessageRef & message)
 {
 	Message::TYPE messageType;
@@ -250,7 +250,7 @@ void CConversation::OnMessage(const MessageRef & message)
 	
 		//if (propValues[0] != myAccountName)
 		{
-			if (this->proto)
+			if (this->proto)
 				(proto->*callback)((const char*)propValues[0], (const char*)propValues[1]);
 		}
 	}
@@ -258,6 +258,6 @@ void CConversation::OnMessage(const MessageRef & message)
 
 void CConversation::SetOnMessageReceivedCallback(OnMessageReceived callback, CSkypeProto* proto)
 {
-	this->proto = proto;
+	this->proto = proto;
 	this->callback = callback;
 }
 \ No newline at end of file