name conflicts solved

git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 414 insertions, 489 deletions

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 8a8e771d45..d0935dd0f6 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -26,7 +26,7 @@ CAppletManager::CAppletManager()
 	m_uiTimer = NULL;
 	m_pLastScreen = NULL;
 
-	
+
 }
 
 //************************************************************************
@@ -42,9 +42,9 @@ CAppletManager::~CAppletManager()
 //************************************************************************
 bool CAppletManager::Initialize(tstring strAppletName)
 {
-	if(!CLCDOutputManager::Initialize(strAppletName))
+	if (!CLCDOutputManager::Initialize(strAppletName))
 		return false;
-	
+
 	GetLCDConnection()->Connect(CConfig::GetIntSetting(DEVICE));
 
 	// set the volumewheel hook
@@ -70,16 +70,16 @@ bool CAppletManager::Initialize(tstring strAppletName)
 	ActivateScreen(&m_EventScreen);
 
 	// hook the neccessary events
-	m_hMIHookMessageWindowEvent = HookEvent(ME_MSG_WINDOWEVENT,CAppletManager::HookMessageWindowEvent);
+	m_hMIHookMessageWindowEvent = HookEvent(ME_MSG_WINDOWEVENT, CAppletManager::HookMessageWindowEvent);
 	m_hMIHookEventAdded = HookEvent(ME_DB_EVENT_ADDED, CAppletManager::HookEventAdded);
-	m_hMIHookStatusChanged  = HookEvent(ME_DB_CONTACT_SETTINGCHANGED,  CAppletManager::HookStatusChanged);
-	m_hMIHookProtoAck =  HookEvent(ME_PROTO_ACK,  CAppletManager::HookProtoAck);
-	m_hMIHookContactDeleted = HookEvent(ME_DB_CONTACT_DELETED,  CAppletManager::HookContactDeleted); 
-	m_hMIHookContactAdded = HookEvent(ME_DB_CONTACT_ADDED,  CAppletManager::HookContactAdded);
-	m_hMIHookSettingChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED,CAppletManager::HookSettingChanged);
-	m_hMIHookContactIsTyping = HookEvent(ME_PROTO_CONTACTISTYPING,CAppletManager::HookContactIsTyping);
-	m_hMIHookChatEvent = HookEvent(ME_GC_HOOK_EVENT,CAppletManager::HookChatInbound);
-	
+	m_hMIHookStatusChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, CAppletManager::HookStatusChanged);
+	m_hMIHookProtoAck = HookEvent(ME_PROTO_ACK, CAppletManager::HookProtoAck);
+	m_hMIHookContactDeleted = HookEvent(ME_DB_CONTACT_DELETED, CAppletManager::HookContactDeleted);
+	m_hMIHookContactAdded = HookEvent(ME_DB_CONTACT_ADDED, CAppletManager::HookContactAdded);
+	m_hMIHookSettingChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, CAppletManager::HookSettingChanged);
+	m_hMIHookContactIsTyping = HookEvent(ME_PROTO_CONTACTISTYPING, CAppletManager::HookContactIsTyping);
+	m_hMIHookChatEvent = HookEvent(ME_GC_HOOK_EVENT, CAppletManager::HookChatInbound);
+
 	// enumerate protocols
 	int iCount;
 	int iProtoCount = 0;
@@ -88,8 +88,7 @@ bool CAppletManager::Initialize(tstring strAppletName)
 	CIRCConnection *pIRCConnection = NULL;
 
 	Proto_EnumAccounts(&iCount, &ppAccounts);
-	for(int i=0;i<iCount;i++)
-	{
+	for (int i = 0; i < iCount; i++) {
 		/**if(ppProtocolDescriptor[i]->type != PROTOTYPE_PROTOCOL)
 			continue;**/
 		if (ppAccounts[i]->bIsEnabled == 0)
@@ -100,7 +99,7 @@ bool CAppletManager::Initialize(tstring strAppletName)
 		pProtoData->iStatus = ID_STATUS_OFFLINE;
 		pProtoData->strProtocol = toTstring(ppAccounts[i]->szModuleName);
 		pProtoData->lTimeStamp = 0;
-		
+
 		// try to create an irc connection for that protocol (will fail if it is no irc protocol)
 		pIRCConnection = CreateIRCConnection(pProtoData->strProtocol);
 
@@ -108,27 +107,27 @@ bool CAppletManager::Initialize(tstring strAppletName)
 	}
 
 	// load status bitmaps
-	m_ahStatusBitmaps[0] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_OFFLINE),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[1] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_ONLINE),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[2] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_AWAY),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[3] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_NA),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[4] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_OCCUPIED),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[5] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_DND),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[6] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_INVISIBLE),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
-	m_ahStatusBitmaps[7] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_FFC),IMAGE_BITMAP,5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[0] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_OFFLINE), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[1] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_ONLINE), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[2] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_AWAY), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[3] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_NA), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[4] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_OCCUPIED), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[5] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_DND), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[6] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_INVISIBLE), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
+	m_ahStatusBitmaps[7] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_STATUS_FFC), IMAGE_BITMAP, 5, 5, LR_MONOCHROME);
 	// Load event bitmaps
-	m_ahEventBitmaps[0] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_MSG),IMAGE_BITMAP,6, 6, LR_MONOCHROME);
-	m_ahEventBitmaps[1] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_CON),IMAGE_BITMAP,6, 6, LR_MONOCHROME);
-	m_ahEventBitmaps[2] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_USER),IMAGE_BITMAP,6, 6, LR_MONOCHROME);
-	m_ahEventBitmaps[3] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_INFO),IMAGE_BITMAP,6, 6, LR_MONOCHROME);
-	
-	m_ahLargeEventBitmaps[0] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_MSG_LARGE),IMAGE_BITMAP,8, 8, LR_MONOCHROME);
-	m_ahLargeEventBitmaps[1] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_CON_LARGE),IMAGE_BITMAP,8, 8, LR_MONOCHROME);
-	m_ahLargeEventBitmaps[2] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_USER_LARGE),IMAGE_BITMAP,8, 8, LR_MONOCHROME);
-	m_ahLargeEventBitmaps[3] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_INFO_LARGE),IMAGE_BITMAP,8, 8, LR_MONOCHROME);
+	m_ahEventBitmaps[0] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_MSG), IMAGE_BITMAP, 6, 6, LR_MONOCHROME);
+	m_ahEventBitmaps[1] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_CON), IMAGE_BITMAP, 6, 6, LR_MONOCHROME);
+	m_ahEventBitmaps[2] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_USER), IMAGE_BITMAP, 6, 6, LR_MONOCHROME);
+	m_ahEventBitmaps[3] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_INFO), IMAGE_BITMAP, 6, 6, LR_MONOCHROME);
+
+	m_ahLargeEventBitmaps[0] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_MSG_LARGE), IMAGE_BITMAP, 8, 8, LR_MONOCHROME);
+	m_ahLargeEventBitmaps[1] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_CON_LARGE), IMAGE_BITMAP, 8, 8, LR_MONOCHROME);
+	m_ahLargeEventBitmaps[2] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_USER_LARGE), IMAGE_BITMAP, 8, 8, LR_MONOCHROME);
+	m_ahLargeEventBitmaps[3] = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_EVENT_INFO_LARGE), IMAGE_BITMAP, 8, 8, LR_MONOCHROME);
 
 	// start the update timer
-	m_uiTimer = SetTimer(0,0,1000/10,CAppletManager::UpdateTimer);
+	m_uiTimer = SetTimer(0, 0, 1000 / 10, CAppletManager::UpdateTimer);
 
 	return true;
 }
@@ -138,20 +137,19 @@ bool CAppletManager::Initialize(tstring strAppletName)
 //************************************************************************
 bool CAppletManager::Shutdown()
 {
-	if(!IsInitialized())
+	if (!IsInitialized())
 		return false;
 
 	// stop the update timer
 	KillTimer(0, m_uiTimer);
-	
+
 	// delete status bitmaps
-	for(int i = 0; i < 8; i++)
+	for (int i = 0; i < 8; i++)
 		DeleteObject(m_ahStatusBitmaps[i]);
 
 	// delete event bitmaps
-	for(int i = 0; i < 4; i++)
-	{
-		DeleteObject(m_ahLargeEventBitmaps[i]);	
+	for (int i = 0; i < 4; i++) {
+		DeleteObject(m_ahLargeEventBitmaps[i]);
 		DeleteObject(m_ahEventBitmaps[i]);
 	}
 
@@ -167,13 +165,12 @@ bool CAppletManager::Shutdown()
 
 	// unhook all irc protocols, and delete the classes
 	vector<CIRCConnection*>::iterator iter = m_vIRCConnections.begin();
-	while(iter != m_vIRCConnections.end())
-	{
+	while (iter != m_vIRCConnections.end()) {
 		delete *iter;
 		iter++;
 	}
 	m_vIRCConnections.clear();
-	
+
 	// Deinitialize the screens
 	m_NotificationScreen.Shutdown();
 	m_EventScreen.Shutdown();
@@ -184,18 +181,17 @@ bool CAppletManager::Shutdown()
 
 	// deinitialize the configuration manager
 	CConfig::Shutdown();
-	
+
 	// delete the protocol information
 	CProtocolData *pProtoData;
-	for(vector<CProtocolData*>::size_type i = 0; i < m_vProtocolData.size(); i++)
-	{
+	for (vector<CProtocolData*>::size_type i = 0; i < m_vProtocolData.size(); i++) {
 		pProtoData = m_vProtocolData[i];
 		delete pProtoData;
 	}
 	m_vProtocolData.clear();
 
 	// deinitialize the outputmanager
-	if(!CLCDOutputManager::Shutdown())
+	if (!CLCDOutputManager::Shutdown())
 		return false;
 	return true;
 }
@@ -203,7 +199,7 @@ bool CAppletManager::Shutdown()
 //************************************************************************
 // Translates the specified string, and inserts the parameters
 //************************************************************************
-tstring CAppletManager::TranslateString(TCHAR *szString,...)
+tstring CAppletManager::TranslateString(TCHAR *szString, ...)
 {
 	TCHAR out[1024];
 	TCHAR *szTranslatedString = TranslateTS(szString);
@@ -220,7 +216,7 @@ tstring CAppletManager::TranslateString(TCHAR *szString,...)
 //************************************************************************
 bool CAppletManager::IsIRCHookEnabled()
 {
-	if(m_vIRCConnections.size() == NULL)
+	if (m_vIRCConnections.size() == NULL)
 		return false;
 	return true;
 }
@@ -242,56 +238,52 @@ CProtocolData* CAppletManager::GetProtocolData(tstring strProtocol)
 //************************************************************************
 bool CAppletManager::Update()
 {
-	if(!CLCDOutputManager::Update())
+	if (!CLCDOutputManager::Update())
 		return false;
-	
+
 	// Update Messagejobs
 	UpdateMessageJobs();
 
 	// Screensaver detection
 	BOOL bActive = false;
 	SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &bActive, 0);
-	if(bActive != (BOOL)m_bScreensaver)
-	{
-		if(CConfig::GetBoolSetting(SCREENSAVER_LOCK)) {
-			if(!m_bScreensaver)
+	if (bActive != (BOOL)m_bScreensaver) {
+		if (CConfig::GetBoolSetting(SCREENSAVER_LOCK)) {
+			if (!m_bScreensaver)
 				ActivateScreensaverScreen();
 			else
 				ActivateEventScreen();
 		}
-		if(CConfig::GetBoolSetting(CONTROL_BACKLIGHTS)) {
-			if(GetLCDConnection() &&
-				GetLCDConnection()->GetConnectionType() == TYPE_LOGITECH)
-			{
+		if (CConfig::GetBoolSetting(CONTROL_BACKLIGHTS)) {
+			if (GetLCDConnection() &&
+				GetLCDConnection()->GetConnectionType() == TYPE_LOGITECH) {
 				CLCDConnectionLogitech *pLCDConnection = (CLCDConnectionLogitech*)GetLCDConnection();
-				
+
 				// Screensaver starts
-				if(!m_bScreensaver)
-				{
+				if (!m_bScreensaver) {
 					m_G15LightStatus = pLCDConnection->GetLightStatus();
 					pLCDConnection->SetLCDBacklight(LCD_OFF);
 					pLCDConnection->SetKBDBacklight(KBD_OFF);
-					pLCDConnection->SetMKeyLight(0,0,0,0);
+					pLCDConnection->SetMKeyLight(0, 0, 0, 0);
 				}
 				// Screensaver ends
-				else
-				{
+				else {
 					SG15LightStatus currentStatus = pLCDConnection->GetLightStatus();
-					
-					if(currentStatus.eLCDBrightness == LCD_OFF)
+
+					if (currentStatus.eLCDBrightness == LCD_OFF)
 						pLCDConnection->SetLCDBacklight(m_G15LightStatus.eLCDBrightness);
-					if(currentStatus.eKBDBrightness == KBD_OFF)
+					if (currentStatus.eKBDBrightness == KBD_OFF)
 						pLCDConnection->SetKBDBacklight(m_G15LightStatus.eKBDBrightness);
-					if(!currentStatus.bMRKey && !currentStatus.bMKey[0] && !currentStatus.bMKey[1]
-						&& !currentStatus.bMKey[2])	
-						pLCDConnection->SetMKeyLight(m_G15LightStatus.bMKey[0],m_G15LightStatus.bMKey[1],m_G15LightStatus.bMKey[2],m_G15LightStatus.bMRKey);
+					if (!currentStatus.bMRKey && !currentStatus.bMKey[0] && !currentStatus.bMKey[1]
+						&& !currentStatus.bMKey[2])
+						pLCDConnection->SetMKeyLight(m_G15LightStatus.bMKey[0], m_G15LightStatus.bMKey[1], m_G15LightStatus.bMKey[2], m_G15LightStatus.bMRKey);
 				}
 			}
 		}
 		m_bScreensaver = bActive != 0;
 	}
 
-	return true;	
+	return true;
 }
 
 //************************************************************************
@@ -300,10 +292,9 @@ bool CAppletManager::Update()
 void CAppletManager::OnScreenExpired(CLCDScreen *pScreen)
 {
 	// If the notification screen has expired, activate the last active screen
-	if(pScreen == (CLCDScreen*)&m_NotificationScreen)
-	{
+	if (pScreen == (CLCDScreen*)&m_NotificationScreen) {
 		ActivateScreen(m_pLastScreen);
-		if(CConfig::GetBoolSetting(TRANSITIONS))
+		if (CConfig::GetBoolSetting(TRANSITIONS))
 			m_pGfx->StartTransition();
 	}
 }
@@ -322,10 +313,9 @@ VOID CALLBACK CAppletManager::UpdateTimer(HWND, UINT, UINT_PTR, DWORD)
 void CAppletManager::SetVolumeWheelHook()
 {
 	// Set the volumewheel hook
-	if(GetLCDConnection() && GetLCDConnection()->GetConnectionType() == TYPE_LOGITECH)
-	{
+	if (GetLCDConnection() && GetLCDConnection()->GetConnectionType() == TYPE_LOGITECH) {
 		CLCDConnectionLogitech *pLCDConnection = (CLCDConnectionLogitech*)GetLCDConnection();
-		if(pLCDConnection->GetConnectionState() == CONNECTED)
+		if (pLCDConnection->GetConnectionState() == CONNECTED)
 			pLCDConnection->SetVolumeWheelHook(CConfig::GetBoolSetting(HOOK_VOLUMEWHEEL));
 	}
 }
@@ -335,8 +325,7 @@ void CAppletManager::SetVolumeWheelHook()
 //************************************************************************
 void CAppletManager::OnConnectionChanged(int iConnectionState)
 {
-	if(iConnectionState == CONNECTED)
-	{
+	if (iConnectionState == CONNECTED) {
 		SetVolumeWheelHook();
 	}
 	CConfig::OnConnectionChanged();
@@ -363,8 +352,9 @@ void CAppletManager::OnConfigChanged()
 //************************************************************************
 // activate a screen
 //************************************************************************
-void CAppletManager::ActivateScreen(CScreen *pScreen) {
-	if(GetActiveScreen() && GetActiveScreen() != &m_NotificationScreen) {
+void CAppletManager::ActivateScreen(CScreen *pScreen)
+{
+	if (GetActiveScreen() && GetActiveScreen() != &m_NotificationScreen) {
 		m_pLastScreen = (CScreen*)GetActiveScreen();
 	}
 
@@ -374,12 +364,13 @@ void CAppletManager::ActivateScreen(CScreen *pScreen) {
 //************************************************************************
 // activates the previous screen
 //************************************************************************
-void CAppletManager::ActivatePreviousScreen() {
-	if(m_pLastScreen) {
+void CAppletManager::ActivatePreviousScreen()
+{
+	if (m_pLastScreen) {
 		ActivateScreen(m_pLastScreen);
 	}
 }
-	
+
 //************************************************************************
 // activates the credits screen
 //************************************************************************
@@ -406,7 +397,7 @@ void CAppletManager::ActivateEventScreen()
 	m_ChatScreen.SetContact(NULL);
 	ActivateScreen(&m_EventScreen);
 
-	if(CConfig::GetBoolSetting(TRANSITIONS))
+	if (CConfig::GetBoolSetting(TRANSITIONS))
 		m_pGfx->StartTransition();
 }
 
@@ -419,7 +410,7 @@ void CAppletManager::ActivateCListScreen()
 	m_ContactlistScreen.ResetPosition();
 	ActivateScreen(&m_ContactlistScreen);
 
-	if(CConfig::GetBoolSetting(TRANSITIONS))
+	if (CConfig::GetBoolSetting(TRANSITIONS))
 		m_pGfx->StartTransition();
 }
 
@@ -428,13 +419,13 @@ void CAppletManager::ActivateCListScreen()
 //************************************************************************
 bool CAppletManager::ActivateChatScreen(MCONTACT hContact)
 {
-	if(!m_ChatScreen.SetContact(hContact))
+	if (!m_ChatScreen.SetContact(hContact))
 		return false;
 
 	m_ContactlistScreen.OnSessionOpened(hContact);
 	ActivateScreen(&m_ChatScreen);
-	
-	if(CConfig::GetBoolSetting(TRANSITIONS))
+
+	if (CConfig::GetBoolSetting(TRANSITIONS))
 		m_pGfx->StartTransition();
 	return true;
 }
@@ -442,15 +433,15 @@ bool CAppletManager::ActivateChatScreen(MCONTACT hContact)
 //************************************************************************
 // returns the contacts displayname
 //************************************************************************
-tstring CAppletManager::GetContactDisplayname(MCONTACT hContact,bool bShortened)
+tstring CAppletManager::GetContactDisplayname(MCONTACT hContact, bool bShortened)
 {
-	if(!bShortened || !CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF))
+	if (!bShortened || !CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF))
 		return pcli->pfnGetContactDisplayName(hContact, 0);
-	
-	tstring strNick = GetContactDisplayname(hContact,false);
-	if(strNick.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
+
+	tstring strNick = GetContactDisplayname(hContact, false);
+	if (strNick.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
 		return strNick.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
-	
+
 	return strNick;
 }
 
@@ -460,12 +451,12 @@ tstring CAppletManager::GetContactDisplayname(MCONTACT hContact,bool bShortened)
 tstring CAppletManager::GetContactGroup(MCONTACT hContact)
 {
 	DBVARIANT dbv;
-	int res = db_get_ts(hContact, "CList", "Group",	&dbv);
+	int res = db_get_ts(hContact, "CList", "Group", &dbv);
 
 	tstring strGroup = _T("");
-	if(!res)
+	if (!res)
 		strGroup = dbv.ptszVal;
-	
+
 	db_free(&dbv);
 	return strGroup;
 }
@@ -475,32 +466,31 @@ tstring CAppletManager::GetContactGroup(MCONTACT hContact)
 //************************************************************************
 HBITMAP CAppletManager::GetEventBitmap(EventType eType, bool bLarge)
 {
-	switch(eType)
-	{
+	switch (eType) {
 	case EVENT_MSG_RECEIVED:
 	case EVENT_MSG_SENT:
 	case EVENT_IRC_RECEIVED:
 	case EVENT_IRC_SENT:
-		if(bLarge)
+		if (bLarge)
 			return m_ahLargeEventBitmaps[0];
 		else
 			return m_ahEventBitmaps[0];
 	case EVENT_PROTO_STATUS:
 	case EVENT_PROTO_CONNECTED:
 	case EVENT_PROTO_DISCONNECTED:
-		if(bLarge)
+		if (bLarge)
 			return m_ahLargeEventBitmaps[1];
 		else
 			return m_ahEventBitmaps[1];
 	case EVENT_STATUS:
 	case EVENT_SIGNED_ON:
 	case EVENT_SIGNED_OFF:
-		if(bLarge)
+		if (bLarge)
 			return m_ahLargeEventBitmaps[2];
 		else
 			return m_ahEventBitmaps[2];
 	default:
-		if(bLarge)
+		if (bLarge)
 			return m_ahLargeEventBitmaps[3];
 		else
 			return m_ahEventBitmaps[3];
@@ -512,8 +502,7 @@ HBITMAP CAppletManager::GetEventBitmap(EventType eType, bool bLarge)
 //************************************************************************
 HBITMAP CAppletManager::GetStatusBitmap(int iStatus)
 {
-	switch(iStatus)
-	{
+	switch (iStatus) {
 	case ID_STATUS_OFFLINE:
 		return m_ahStatusBitmaps[0];
 	case ID_STATUS_ONLINE:
@@ -541,23 +530,21 @@ tstring CAppletManager::GetFormattedTimestamp(tm *tm_time)
 	time_t now;
 	tm tm_now;
 	time(&now);
-	localtime_s(&tm_now,&now);
+	localtime_s(&tm_now, &now);
 
 	TCHAR buffer[128];
-	
-	if(tm_time->tm_mday != tm_now.tm_mday || tm_time->tm_mon != tm_now.tm_mon)
-	{
-		if(CConfig::GetBoolSetting(TIMESTAMP_SECONDS))
-			_tcsftime(buffer,128,_T("[%x %H:%M:%S]"),tm_time);
+
+	if (tm_time->tm_mday != tm_now.tm_mday || tm_time->tm_mon != tm_now.tm_mon) {
+		if (CConfig::GetBoolSetting(TIMESTAMP_SECONDS))
+			_tcsftime(buffer, 128, _T("[%x %H:%M:%S]"), tm_time);
 		else
-			_tcsftime(buffer,128,_T("[%x %H:%M]"),tm_time);
+			_tcsftime(buffer, 128, _T("[%x %H:%M]"), tm_time);
 	}
-	else
-	{
-		if(CConfig::GetBoolSetting(TIMESTAMP_SECONDS))
-			_tcsftime(buffer,128,_T("[%H:%M:%S]"),tm_time);
+	else {
+		if (CConfig::GetBoolSetting(TIMESTAMP_SECONDS))
+			_tcsftime(buffer, 128, _T("[%H:%M:%S]"), tm_time);
 		else
-			_tcsftime(buffer,128,_T("[%H:%M]"),tm_time);
+			_tcsftime(buffer, 128, _T("[%H:%M]"), tm_time);
 	}
 
 	return toTstring(buffer);
@@ -568,43 +555,39 @@ tstring CAppletManager::GetFormattedTimestamp(tm *tm_time)
 //************************************************************************
 void CAppletManager::HandleEvent(CEvent *pEvent)
 {
-	TRACE(_T("<< Event: %i\n"),(int)pEvent->eType);
-	
+	TRACE(_T("<< Event: %i\n"), (int)pEvent->eType);
+
 	// check if the event's timestamp needs to be set
-	if(!pEvent->bTime)
-	{
+	if (!pEvent->bTime) {
 		time_t now;
 		time(&now);
-		localtime_s(&pEvent->Time,&now);
+		localtime_s(&pEvent->Time, &now);
 	}
 	// check wether the event needs notification
-	
+
 	// check for protocol filters
-	if(pEvent->hContact != NULL && pEvent->eType != EVENT_CONTACT_ADDED)
-	{
+	if (pEvent->hContact != NULL && pEvent->eType != EVENT_CONTACT_ADDED) {
 		char *szProto = GetContactProto(pEvent->hContact);
-		if(szProto == NULL || !CConfig::GetProtocolNotificationFilter(toTstring(szProto)))
+		if (szProto == NULL || !CConfig::GetProtocolNotificationFilter(toTstring(szProto)))
 			pEvent->bNotification = false;
 	}
 	pEvent->bLog = pEvent->bNotification;
 
-	if(db_mc_isSub(pEvent->hContact))
-	{
+	if (db_mc_isSub(pEvent->hContact)) {
 		pEvent->bLog = false;
 		pEvent->bNotification = false;
 	}
 
 	// if the applet is in foreground, skip notifications for the chatsession contact
-	if(pEvent->hContact && GetLCDConnection()->IsForeground() && pEvent->hContact == m_ChatScreen.GetContact() &&
-		(!m_ChatScreen.IsInputActive() || !CConfig::GetBoolSetting(NOTIFY_NO_SKIP_REPLY)))
-	{
-		if(pEvent->eType == EVENT_STATUS  && CConfig::GetBoolSetting(NOTIFY_SKIP_STATUS))
+	if (pEvent->hContact && GetLCDConnection()->IsForeground() && pEvent->hContact == m_ChatScreen.GetContact() &&
+		(!m_ChatScreen.IsInputActive() || !CConfig::GetBoolSetting(NOTIFY_NO_SKIP_REPLY))) {
+		if (pEvent->eType == EVENT_STATUS  && CConfig::GetBoolSetting(NOTIFY_SKIP_STATUS))
 			pEvent->bNotification = false;
-		if( pEvent->eType == EVENT_SIGNED_ON && CConfig::GetBoolSetting(NOTIFY_SKIP_SIGNON))
+		if (pEvent->eType == EVENT_SIGNED_ON && CConfig::GetBoolSetting(NOTIFY_SKIP_SIGNON))
 			pEvent->bNotification = false;
-		if(pEvent->eType == EVENT_SIGNED_OFF && CConfig::GetBoolSetting(NOTIFY_SKIP_SIGNOFF))
+		if (pEvent->eType == EVENT_SIGNED_OFF && CConfig::GetBoolSetting(NOTIFY_SKIP_SIGNOFF))
 			pEvent->bNotification = false;
-		if((pEvent->eType == EVENT_IRC_RECEIVED || pEvent->eType == EVENT_MSG_RECEIVED) && CConfig::GetBoolSetting(NOTIFY_SKIP_MESSAGES))
+		if ((pEvent->eType == EVENT_IRC_RECEIVED || pEvent->eType == EVENT_MSG_RECEIVED) && CConfig::GetBoolSetting(NOTIFY_SKIP_MESSAGES))
 			pEvent->bNotification = false;
 	}
 
@@ -615,15 +598,13 @@ void CAppletManager::HandleEvent(CEvent *pEvent)
 	m_ContactlistScreen.OnEventReceived(pEvent);
 
 	// activate notification screen if neccessary (and screensaverscreen is not active)
-	if(pEvent->bNotification)
-	{
-		if(GetActiveScreen() != (CLCDScreen*)&m_NotificationScreen && GetActiveScreen() != (CLCDScreen*)&m_ScreensaverScreen)
-		{
+	if (pEvent->bNotification) {
+		if (GetActiveScreen() != (CLCDScreen*)&m_NotificationScreen && GetActiveScreen() != (CLCDScreen*)&m_ScreensaverScreen) {
 			m_NotificationScreen.SetAlert(true);
-			m_NotificationScreen.SetExpiration(CConfig::GetIntSetting(NOTIFY_DURATION)*1000);
+			m_NotificationScreen.SetExpiration(CConfig::GetIntSetting(NOTIFY_DURATION) * 1000);
 			ActivateScreen(&m_NotificationScreen);
 
-			if(GetLCDConnection()->IsForeground() && CConfig::GetBoolSetting(TRANSITIONS))
+			if (GetLCDConnection()->IsForeground() && CConfig::GetBoolSetting(TRANSITIONS))
 				m_pGfx->StartTransition();
 		}
 	}
@@ -635,11 +616,9 @@ void CAppletManager::HandleEvent(CEvent *pEvent)
 void CAppletManager::UpdateMessageJobs()
 {
 	list<SMessageJob*>::iterator iter = m_MessageJobs.begin();
-	while(iter != m_MessageJobs.end())
-	{
+	while (iter != m_MessageJobs.end()) {
 		// TODO: Fertigstellen
-		if((*iter)->dwTimestamp + 15*1000 < GetTickCount())
-		{
+		if ((*iter)->dwTimestamp + 15 * 1000 < GetTickCount()) {
 			CEvent Event;
 
 			Event.eType = EVENT_MESSAGE_ACK;
@@ -647,7 +626,7 @@ void CAppletManager::UpdateMessageJobs()
 			Event.hContact = (*iter)->hContact;
 			Event.iValue = ACKRESULT_FAILED;
 			Event.strValue = TranslateString(_T("Timeout: No response from contact/server"));
-			
+
 			HandleEvent(&Event);
 
 			SMessageJob *pJob = *iter;
@@ -674,34 +653,32 @@ void CAppletManager::AddMessageJob(SMessageJob *pJob)
 void CAppletManager::FinishMessageJob(SMessageJob *pJob)
 {
 	list<SMessageJob*>::iterator iter = m_MessageJobs.begin();
-	while(iter != m_MessageJobs.end())
-	{
-		if((*iter) == pJob)
-		{
+	while (iter != m_MessageJobs.end()) {
+		if ((*iter) == pJob) {
 			char *szProto = GetContactProto(pJob->hContact);
 			tstring strProto = toTstring(szProto);
 			CIRCConnection *pIRCCon = GetIRCConnection(strProto);
 
 			// Only add the message to the history if the contact isn't an irc chatroom
-			if(!(pIRCCon && db_get_b(pJob->hContact, szProto, "ChatRoom", 0) != 0))
-			{	
+			if (!(pIRCCon && db_get_b(pJob->hContact, szProto, "ChatRoom", 0) != 0)) {
 				// Add the message to the database
 				DBEVENTINFO dbei = { 0 };
 				dbei.cbSize = sizeof(dbei);
 				dbei.eventType = EVENTTYPE_MESSAGE;
-				dbei.flags = DBEF_SENT | DBEF_UTF;		
+				dbei.flags = DBEF_SENT | DBEF_UTF;
 				dbei.szModule = szProto;
 				dbei.timestamp = time(NULL);
 				// Check if protocoll is valid
-				if(dbei.szModule == NULL)
+				if (dbei.szModule == NULL)
 					return;
 
 				dbei.cbBlob = pJob->iBufferSize;
-				dbei.pBlob = (PBYTE) pJob->pcBuffer;
+				dbei.pBlob = (PBYTE)pJob->pcBuffer;
 
 				db_event_add(pJob->hContact, &dbei);
 			}
-			SMessageJob *pJob = *iter;
+
+			pJob = *iter;
 			m_MessageJobs.erase(iter);
 			free(pJob->pcBuffer);
 			delete(pJob);
@@ -716,11 +693,9 @@ void CAppletManager::FinishMessageJob(SMessageJob *pJob)
 void CAppletManager::CancelMessageJob(SMessageJob *pJob)
 {
 	list<SMessageJob*>::iterator iter = m_MessageJobs.begin();
-	while(iter != m_MessageJobs.end())
-	{
-		if((*iter) == pJob)
-		{
-			SMessageJob *pJob = *iter;
+	while (iter != m_MessageJobs.end()) {
+		if ((*iter) == pJob) {
+			pJob = *iter;
 			m_MessageJobs.erase(iter);
 			free(pJob->pcBuffer);
 			delete(pJob);
@@ -732,47 +707,47 @@ void CAppletManager::CancelMessageJob(SMessageJob *pJob)
 //************************************************************************
 // sends typing notifications to the specified contact
 //************************************************************************
-void CAppletManager::SendTypingNotification(MCONTACT hContact,bool bEnable)
+void CAppletManager::SendTypingNotification(MCONTACT hContact, bool bEnable)
 {
 	if (!hContact)
-        return;
+		return;
 
-    // Don't send to protocols who don't support typing
-    // Don't send to users who are unchecked in the typing notification options
-    // Don't send to protocols that are offline
-    // Don't send to users who are not visible and
-    // Don't send to users who are not on the visible list when you are in invisible mode.
-    if (!db_get_b(hContact, "SRMsg", "SupportTyping", db_get_b(NULL, "SRMsg", "DefaultTyping", 1)))
-        return;
+	// Don't send to protocols who don't support typing
+	// Don't send to users who are unchecked in the typing notification options
+	// Don't send to protocols that are offline
+	// Don't send to users who are not visible and
+	// Don't send to users who are not on the visible list when you are in invisible mode.
+	if (!db_get_b(hContact, "SRMsg", "SupportTyping", db_get_b(NULL, "SRMsg", "DefaultTyping", 1)))
+		return;
 
 	char *szProto = GetContactProto(hContact);
-    if (!szProto)
-        return;
-
-    DWORD typeCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0);
-    if (!(typeCaps & PF4_SUPPORTTYPING))
-        return;
-
-    DWORD protoStatus = CallProtoService(szProto, PS_GETSTATUS, 0, 0);
-    if (protoStatus < ID_STATUS_ONLINE)
-        return;
-
-    DWORD protoCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);
-    if (protoCaps & PF1_VISLIST && db_get_w(hContact, szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)
-        return;
-    if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && db_get_w(hContact, szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)
-        return;
-    if (db_get_b(hContact, "CList", "NotOnList", 0)
-        && !db_get_b(NULL, "SRMsg", "UnknownTyping", 1))
-        return;
-    // End user check
+	if (!szProto)
+		return;
+
+	DWORD typeCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0);
+	if (!(typeCaps & PF4_SUPPORTTYPING))
+		return;
+
+	DWORD protoStatus = CallProtoService(szProto, PS_GETSTATUS, 0, 0);
+	if (protoStatus < ID_STATUS_ONLINE)
+		return;
+
+	DWORD protoCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);
+	if (protoCaps & PF1_VISLIST && db_get_w(hContact, szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)
+		return;
+	if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && db_get_w(hContact, szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)
+		return;
+	if (db_get_b(hContact, "CList", "NotOnList", 0)
+		&& !db_get_b(NULL, "SRMsg", "UnknownTyping", 1))
+		return;
+	// End user check
 	CallService(MS_PROTO_SELFISTYPING, hContact, bEnable ? PROTOTYPE_SELFTYPING_ON : PROTOTYPE_SELFTYPING_OFF);
 }
 
 //************************************************************************
 // sends a message to the specified contact
 //************************************************************************
-MEVENT CAppletManager::SendMessageToContact(MCONTACT hContact,tstring strMessage)
+MEVENT CAppletManager::SendMessageToContact(MCONTACT hContact, tstring strMessage)
 {
 	tstring strAscii = _A2T(toNarrowString(strMessage).c_str());
 	SMessageJob *pJob = new SMessageJob();
@@ -784,12 +759,11 @@ MEVENT CAppletManager::SendMessageToContact(MCONTACT hContact,tstring strMessage
 
 	CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(strProto);
 
-	if(pIRCCon && db_get_b(hContact, szProto, "ChatRoom", 0) != 0)
-	{
+	if (pIRCCon && db_get_b(hContact, szProto, "ChatRoom", 0) != 0) {
 		GCDEST gcd = { szProto, 0, GC_EVENT_SENDMESSAGE };
 
 		DBVARIANT dbv;
-		if (!db_get_ts(hContact, szProto, "Nick", &dbv)) 
+		if (!db_get_ts(hContact, szProto, "Nick", &dbv))
 			gcd.ptszID = dbv.ptszVal;
 		else
 			return NULL;
@@ -802,22 +776,21 @@ MEVENT CAppletManager::SendMessageToContact(MCONTACT hContact,tstring strMessage
 		gce.ptszText = (LPTSTR)strAscii.c_str();
 		gce.time = time(NULL);
 		gce.bIsMe = true;
-		CallService(MS_GC_EVENT, NULL, (LPARAM) &gce);
+		CallService(MS_GC_EVENT, NULL, (LPARAM)&gce);
 
 		pJob->hEvent = NULL;
 	}
-	else
-	{
+	else {
 		char* szMsgUtf = mir_utf8encodeW(strMessage.c_str());
 
-		pJob->iBufferSize = (int)mir_strlen(szMsgUtf)+1;
+		pJob->iBufferSize = (int)mir_strlen(szMsgUtf) + 1;
 		pJob->pcBuffer = (char *)malloc(pJob->iBufferSize);
 		pJob->dwFlags = 0;
 
-		memcpy(pJob->pcBuffer,szMsgUtf,pJob->iBufferSize);
+		memcpy(pJob->pcBuffer, szMsgUtf, pJob->iBufferSize);
 		mir_free(szMsgUtf);
 
-		pJob->hEvent = (MEVENT)CallContactService(pJob->hContact, PSS_MESSAGE, 0, (LPARAM)pJob->pcBuffer );
+		pJob->hEvent = (MEVENT)CallContactService(pJob->hContact, PSS_MESSAGE, 0, (LPARAM)pJob->pcBuffer);
 		CAppletManager::GetInstance()->AddMessageJob(pJob);
 	}
 
@@ -836,8 +809,8 @@ bool CAppletManager::IsMessageWindowOpen(MCONTACT hContact)
 
 	MessageWindowData mwd;
 	mwd.cbSize = sizeof(MessageWindowData);
-	CallService(MS_MSG_GETWINDOWDATA,(WPARAM)&mwid,(LPARAM)&mwd);
-	if(mwd.uState & MSG_WINDOW_STATE_EXISTS)
+	CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd);
+	if (mwd.uState & MSG_WINDOW_STATE_EXISTS)
 		return true;
 	return false;
 }
@@ -845,7 +818,7 @@ bool CAppletManager::IsMessageWindowOpen(MCONTACT hContact)
 //************************************************************************
 // marks the given message as read
 //************************************************************************
-void CAppletManager::MarkMessageAsRead(MCONTACT hContact,MEVENT hEvent)
+void CAppletManager::MarkMessageAsRead(MCONTACT hContact, MEVENT hEvent)
 {
 	db_event_markRead(hContact, hEvent);
 	CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)hEvent);
@@ -862,23 +835,22 @@ bool CAppletManager::TranslateDBEvent(CEvent *pEvent, WPARAM hContact, LPARAM hd
 	//dbevent.flags |= PREF_UNICODE;
 	dbevent.cbSize = sizeof(dbevent);
 	dbevent.cbBlob = db_event_getBlobSize(hdbevent);
-	if(dbevent.cbBlob == -1)		// hdbevent is invalid
+	if (dbevent.cbBlob == -1)		// hdbevent is invalid
 	{
 		return false;
 	}
 	dbevent.pBlob = (PBYTE)malloc(dbevent.cbBlob);
-	if(db_event_get(hdbevent, &dbevent) != 0)
-	{
+	if (db_event_get(hdbevent, &dbevent) != 0) {
 		free(dbevent.pBlob);
 		return false;
 	}
-	
+
 	pEvent->dwFlags = dbevent.flags;
 	pEvent->hContact = hContact;
 	pEvent->hValue = hdbevent;
 
 	time_t timestamp = (time_t)dbevent.timestamp;
-	localtime_s(&pEvent->Time,&timestamp);
+	localtime_s(&pEvent->Time, &timestamp);
 	pEvent->bTime = true;
 	/*
 	if(dbevent.eventType == EVENTTYPE_MESSAGE && dbevent.flags & DBEF_READ) {
@@ -887,70 +859,70 @@ bool CAppletManager::TranslateDBEvent(CEvent *pEvent, WPARAM hContact, LPARAM hd
 	}
 	*/
 	// Skip events from the user except for messages
-	if(dbevent.eventType != EVENTTYPE_MESSAGE && (dbevent.flags & DBEF_SENT))
-	{
+	if (dbevent.eventType != EVENTTYPE_MESSAGE && (dbevent.flags & DBEF_SENT)) {
 		free(dbevent.pBlob);
 		return false;
 	}
-	
+
 	int msglen = 0;
 
-	tstring strName = CAppletManager::GetContactDisplayname(hContact,true);
-	
-	switch(dbevent.eventType) {
+	tstring strName = CAppletManager::GetContactDisplayname(hContact, true);
+
+	switch (dbevent.eventType) {
 	case EVENTTYPE_MESSAGE:
-		msglen = (int)mir_strlen((char *) dbevent.pBlob) + 1;
+		msglen = (int)mir_strlen((char *)dbevent.pBlob) + 1;
 		if (dbevent.flags & DBEF_UTF) {
 			pEvent->strValue = Utf8_Decode((char*)dbevent.pBlob);
-		} else if ((int) dbevent.cbBlob == msglen*3){
-			pEvent->strValue =  (TCHAR *) & dbevent.pBlob[msglen];
-		} else {
+		}
+		else if ((int)dbevent.cbBlob == msglen * 3) {
+			pEvent->strValue = (TCHAR *)& dbevent.pBlob[msglen];
+		}
+		else {
 			pEvent->strValue = toTstring((char*)dbevent.pBlob);
 		}
-		pEvent->eType = (dbevent.flags & DBEF_SENT) ? EVENT_MSG_SENT:EVENT_MSG_RECEIVED;
-		if(pEvent->eType == EVENT_MSG_RECEIVED)
-		{	
+		pEvent->eType = (dbevent.flags & DBEF_SENT) ? EVENT_MSG_SENT : EVENT_MSG_RECEIVED;
+		if (pEvent->eType == EVENT_MSG_RECEIVED) {
 			pEvent->dwFlags = MSG_UNREAD;
-			if(CConfig::GetBoolSetting(NOTIFY_MESSAGES))
+			if (CConfig::GetBoolSetting(NOTIFY_MESSAGES))
 				pEvent->bNotification = true;
 		}
 
-		pEvent->strDescription = strName + _T(": ") +pEvent->strValue;
-		pEvent->strSummary = TranslateString(_T("New message from %s"),strName.c_str());
+		pEvent->strDescription = strName + _T(": ") + pEvent->strValue;
+		pEvent->strSummary = TranslateString(_T("New message from %s"), strName.c_str());
 		break;
 	case EVENTTYPE_URL:
-		if(CConfig::GetBoolSetting(NOTIFY_URL))
+		if (CConfig::GetBoolSetting(NOTIFY_URL))
 			pEvent->bNotification = true;
 
 		pEvent->eType = EVENT_URL;
-		pEvent->strDescription = TranslateString(_T("Incoming URL from %s"),strName.c_str());
+		pEvent->strDescription = TranslateString(_T("Incoming URL from %s"), strName.c_str());
 		break;
 	case EVENTTYPE_CONTACTS:
-		if(CConfig::GetBoolSetting(NOTIFY_CONTACTS))
+		if (CConfig::GetBoolSetting(NOTIFY_CONTACTS))
 			pEvent->bNotification = true;
 
-		pEvent->strDescription = TranslateString(_T("Incoming contacts from %s"),strName.c_str());
+		pEvent->strDescription = TranslateString(_T("Incoming contacts from %s"), strName.c_str());
 		pEvent->eType = EVENT_CONTACTS;
 		break;
 	case EVENTTYPE_ADDED:
-		if(CConfig::GetBoolSetting(NOTIFY_CONTACTS))
+		if (CConfig::GetBoolSetting(NOTIFY_CONTACTS))
 			pEvent->bNotification = true;
 
-		pEvent->strDescription = TranslateString(_T("You were added by %s"),strName.c_str());
+		pEvent->strDescription = TranslateString(_T("You were added by %s"), strName.c_str());
 		pEvent->eType = EVENT_ADDED;
 		break;
 	case EVENTTYPE_AUTHREQUEST:
-		if(CConfig::GetBoolSetting(NOTIFY_CONTACTS))
+		if (CConfig::GetBoolSetting(NOTIFY_CONTACTS))
 			pEvent->bNotification = true;
 
 		pEvent->strDescription = TranslateString(_T("Incoming Authrequest!"));
 		pEvent->eType = EVENT_AUTHREQUEST;
 		break;
 	case EVENTTYPE_FILE:
-		if(CConfig::GetBoolSetting(NOTIFY_FILE))
+		if (CConfig::GetBoolSetting(NOTIFY_FILE))
 			pEvent->bNotification = true;
 
-		pEvent->strDescription = TranslateString(_T("Incoming file from %s"),strName.c_str());
+		pEvent->strDescription = TranslateString(_T("Incoming file from %s"), strName.c_str());
 		pEvent->eType = EVENT_FILE;
 		break;
 	default:
@@ -958,10 +930,9 @@ bool CAppletManager::TranslateDBEvent(CEvent *pEvent, WPARAM hContact, LPARAM hd
 		break;
 	}
 
-	if(CConfig::GetBoolSetting(NOTIFY_SHOWPROTO))
-	{
+	if (CConfig::GetBoolSetting(NOTIFY_SHOWPROTO)) {
 		char *szProto = GetContactProto(pEvent->hContact);
-		pEvent->strDescription = _T("(")+toTstring(szProto)+_T(") ") + pEvent->strDescription;
+		pEvent->strDescription = _T("(") + toTstring(szProto) + _T(") ") + pEvent->strDescription;
 	}
 
 	// Clean up
@@ -978,20 +949,17 @@ tstring CAppletManager::StripIRCFormatting(tstring strText)
 	tstring strEntity = _T("");
 	tstring strReplace = _T("");
 
-	while(i < strText.length())
-	{
-		start = strText.find(_T("%"),i);
-		if(start != string::npos && start < strText.length() - 1)
-		{
-			strEntity = strText[start+1];
-			if(strEntity == _T("%"))
-			{
-				strText.replace(start,2,_T("%"));
+	while (i < strText.length()) {
+		start = strText.find(_T("%"), i);
+		if (start != string::npos && start < strText.length() - 1) {
+			strEntity = strText[start + 1];
+			if (strEntity == _T("%")) {
+				strText.replace(start, 2, _T("%"));
 				i = start + 1;
 			}
 			/*
-			else if(strEntity == _T("b") || strEntity == _T("B") || 
-				strEntity == _T("i") || strEntity == _T("I") || 
+			else if(strEntity == _T("b") || strEntity == _T("B") ||
+				strEntity == _T("i") || strEntity == _T("I") ||
 				strEntity ==_T("u") || strEntity == _T("U") ||
 				strEntity == _T("C") ||strEntity == _T("F"))
 			{
@@ -999,14 +967,12 @@ tstring CAppletManager::StripIRCFormatting(tstring strText)
 				i = start;
 			}
 			*/
-			else if(strEntity == _T("c") || strEntity == _T("f"))
-			{
-				strText.erase(start,4);			
+			else if (strEntity == _T("c") || strEntity == _T("f")) {
+				strText.erase(start, 4);
 				i = start;
 			}
-			else
-			{
-				strText.erase(start,2);
+			else {
+				strText.erase(start, 2);
 				i = start;
 			}
 		}
@@ -1023,9 +989,8 @@ tstring CAppletManager::StripIRCFormatting(tstring strText)
 CIRCConnection *CAppletManager::GetIRCConnection(tstring strProtocol)
 {
 	vector<CIRCConnection*>::iterator iter = m_vIRCConnections.begin();
-	while(iter != m_vIRCConnections.end())
-	{
-		if((*iter)->strProtocol == strProtocol)
+	while (iter != m_vIRCConnections.end()) {
+		if ((*iter)->strProtocol == strProtocol)
 			return *iter;
 		iter++;
 	}
@@ -1040,7 +1005,7 @@ CIRCConnection *CAppletManager::CreateIRCConnection(tstring strProtocol)
 	CIRCConnection *pIRCCon = new CIRCConnection();
 	pIRCCon->strProtocol = strProtocol;
 	pIRCCon->strNetwork = _T("");
-	
+
 	m_vIRCConnections.push_back(pIRCCon);
 
 	return pIRCCon;
@@ -1052,21 +1017,19 @@ CIRCConnection *CAppletManager::CreateIRCConnection(tstring strProtocol)
 CIRCHistory *CAppletManager::GetIRCHistory(MCONTACT hContact)
 {
 	list<CIRCHistory*>::iterator iter = m_LIRCHistorys.begin();
-	while(iter != m_LIRCHistorys.end())
-	{
-		if((*iter)->hContact == hContact)
+	while (iter != m_LIRCHistorys.end()) {
+		if ((*iter)->hContact == hContact)
 			return *iter;
 		iter++;
 	}
 	return NULL;
 }
 
-CIRCHistory *CAppletManager::GetIRCHistoryByName(tstring strProtocol,tstring strChannel)
+CIRCHistory *CAppletManager::GetIRCHistoryByName(tstring strProtocol, tstring strChannel)
 {
 	list<CIRCHistory*>::iterator iter = m_LIRCHistorys.begin();
-	while(iter != m_LIRCHistorys.end())
-	{
-		if((*iter)->strChannel == strChannel && (*iter)->strProtocol == strProtocol)
+	while (iter != m_LIRCHistorys.end()) {
+		if ((*iter)->strChannel == strChannel && (*iter)->strProtocol == strProtocol)
 			return *iter;
 		iter++;
 	}
@@ -1079,16 +1042,14 @@ CIRCHistory *CAppletManager::GetIRCHistoryByName(tstring strProtocol,tstring str
 void CAppletManager::DeleteIRCHistory(MCONTACT hContact)
 {
 	list<CIRCHistory*>::iterator iter = m_LIRCHistorys.begin();
-	while(iter != m_LIRCHistorys.end())
-	{
-		if((*iter)->hContact == hContact)
-		{
+	while (iter != m_LIRCHistorys.end()) {
+		if ((*iter)->hContact == hContact) {
 			CIRCHistory *pHistory = *iter;
 			pHistory->LMessages.clear();
 			pHistory->LUsers.clear();
 
 			m_LIRCHistorys.erase(iter);
-			
+
 			delete pHistory;
 
 			return;
@@ -1100,15 +1061,14 @@ void CAppletManager::DeleteIRCHistory(MCONTACT hContact)
 //************************************************************************
 // creates a history class for the specified IRC channel
 //************************************************************************
-CIRCHistory *CAppletManager::CreateIRCHistory(MCONTACT hContact,tstring strChannel)
+CIRCHistory *CAppletManager::CreateIRCHistory(MCONTACT hContact, tstring strChannel)
 {
 	char *szProto = GetContactProto(hContact);
-	if(!szProto)
+	if (!szProto)
 		return NULL;
 
-	CIRCHistory *pHistory = GetIRCHistoryByName(toTstring(szProto),strChannel);
-	if(pHistory)
-	{
+	CIRCHistory *pHistory = GetIRCHistoryByName(toTstring(szProto), strChannel);
+	if (pHistory) {
 		pHistory->hContact = hContact;
 		return pHistory;
 	}
@@ -1119,14 +1079,14 @@ CIRCHistory *CAppletManager::CreateIRCHistory(MCONTACT hContact,tstring strChann
 	pHistory->strProtocol = toTstring(szProto);
 
 	m_LIRCHistorys.push_back(pHistory);
-	
+
 	return pHistory;
 }
 
-CIRCHistory *CAppletManager::CreateIRCHistoryByName(tstring strProtocol,tstring strChannel)
+CIRCHistory *CAppletManager::CreateIRCHistoryByName(tstring strProtocol, tstring strChannel)
 {
-	CIRCHistory *pHistory = GetIRCHistoryByName(strProtocol,strChannel);
-	if(pHistory)
+	CIRCHistory *pHistory = GetIRCHistoryByName(strProtocol, strChannel);
+	if (pHistory)
 		return pHistory;
 
 	pHistory = new CIRCHistory();
@@ -1135,7 +1095,7 @@ CIRCHistory *CAppletManager::CreateIRCHistoryByName(tstring strProtocol,tstring
 	pHistory->strProtocol = strProtocol;
 
 	m_LIRCHistorys.push_back(pHistory);
-	
+
 	return pHistory;
 }
 
@@ -1150,113 +1110,103 @@ int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam)
 {
 	GCEVENT *gce = (GCEVENT*)lParam;
 	GCDEST *gcd;
-	
+
 	if (gce == NULL || (gcd = gce->pDest) == NULL) {
 		TRACE(_T("<< [%s] skipping invalid event\n"));
 		return 0;
 	}
 
-	TRACE(_T("<< [%s:%s] event %04X\n"),toTstring(gcd->pszModule).c_str(), gcd->ptszID, gcd->iType);
-	
+	TRACE(_T("<< [%s:%s] event %04X\n"), toTstring(gcd->pszModule).c_str(), gcd->ptszID, gcd->iType);
+
 	// get the matching irc connection entry
 	CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(toTstring(gcd->pszModule));
-	if(!pIRCCon)
-	{
-		TRACE(_T("<< [%s] connection not found, skipping event\n"),toTstring(gcd->pszModule).c_str());
+	if (!pIRCCon) {
+		TRACE(_T("<< [%s] connection not found, skipping event\n"), toTstring(gcd->pszModule).c_str());
 		return 0;
 	}
 
 	// fetch the network name
-	if(gcd->iType == GC_EVENT_CHANGESESSIONAME)
-	{
-		if (gcd->ptszID && !mir_tstrcmpi(gcd->ptszID,_T("Network log")))
-		{
+	if (gcd->iType == GC_EVENT_CHANGESESSIONAME) {
+		if (gcd->ptszID && !mir_tstrcmpi(gcd->ptszID, _T("Network log"))) {
 			pIRCCon->strNetwork = toTstring(gce->ptszText);
-			TRACE(_T("\t Found network identifier: %s\n"),pIRCCon->strNetwork.c_str());
+			TRACE(_T("\t Found network identifier: %s\n"), pIRCCon->strNetwork.c_str());
 			return 0;
-		}	
+		}
 	}
-	
+
 	CEvent Event;
-	if(gce->bIsMe)
+	if (gce->bIsMe)
 		Event.eType = EVENT_IRC_SENT;
 	else
 		Event.eType = EVENT_IRC_RECEIVED;
 	Event.iValue = gcd->iType;
 	Event.hValue = lParam;
-	
+
 	CIRCHistory *pHistory = NULL;
-	if(gcd->ptszID)
-	{
+	if (gcd->ptszID) {
 		tstring strChannel = toTstring(gcd->ptszID);
 		tstring::size_type pos = strChannel.find('-');
-		if(pos != tstring::npos)
-			strChannel = strChannel.substr(0,pos-1);
-		else
-		{
-			if(mir_tstrcmpi(gcd->ptszID,_T("Network log")))
+		if (pos != tstring::npos)
+			strChannel = strChannel.substr(0, pos - 1);
+		else {
+			if (mir_tstrcmpi(gcd->ptszID, _T("Network log")))
 				TRACE(_T("\t WARNING: ignoring unknown event!\n"));
 			return 0;
 		}
-		pHistory = CAppletManager::GetInstance()->GetIRCHistoryByName(pIRCCon->strProtocol,strChannel);
-		if(!pHistory)
-		{
-			if(gcd->iType == GC_EVENT_JOIN)
-			{
-				pHistory = CAppletManager::GetInstance()->CreateIRCHistoryByName(pIRCCon->strProtocol,strChannel);
-				if(pHistory)
+		pHistory = CAppletManager::GetInstance()->GetIRCHistoryByName(pIRCCon->strProtocol, strChannel);
+		if (!pHistory) {
+			if (gcd->iType == GC_EVENT_JOIN) {
+				pHistory = CAppletManager::GetInstance()->CreateIRCHistoryByName(pIRCCon->strProtocol, strChannel);
+				if (pHistory)
 					pHistory->LUsers.push_back(toTstring(gce->ptszNick));
 			}
 			return 0;
 		}
 		Event.hContact = pHistory->hContact;
 	}
-	else if(gcd->iType != GC_EVENT_INFORMATION)
-	{
+	else if (gcd->iType != GC_EVENT_INFORMATION) {
 		TRACE(_T("\t WARNING: ignoring unknown event!\n"));
 		return 0;
 	}
 	else
 		Event.hContact = NULL;
-	
+
 	// Ignore events from hidden chatrooms, except for join events
-	if(gcd->ptszID != NULL && db_get_b(Event.hContact,"CList","Hidden",0))
-	{
-		if(gcd->iType == GC_EVENT_JOIN && pHistory)
+	if (gcd->ptszID != NULL && db_get_b(Event.hContact, "CList", "Hidden", 0)) {
+		if (gcd->iType == GC_EVENT_JOIN && pHistory)
 			pHistory->LUsers.push_back(toTstring(gce->ptszNick));
 
 		TRACE(_T("\t Chatroom is hidden, skipping event!\n"));
 		return 0;
 	}
-	
+
 	tstring strText = StripIRCFormatting(toTstring(gce->ptszText));
 	tstring strNick = toTstring(gce->ptszNick);
 	tstring strStatus = toTstring(gce->ptszStatus);
 
-	if(CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strNick.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
+	if (CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strNick.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
 		strNick = strNick.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
-	
+
 	TRACE(_T("\t Handling event...\t"));
 
-	switch(gcd->iType)
-	{
+	switch (gcd->iType) {
 	case GC_EVENT_INFORMATION:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_CHANNEL))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_CHANNEL))
 			Event.bNotification = true;
-		
-		if(strText.find(_T("CTCP")) == 0)
+
+		if (strText.find(_T("CTCP")) == 0)
 			Event.strValue = _T("--> ") + strText;
 		else
 			Event.strValue = strText;
 
 		break;
 	case GC_EVENT_ACTION:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_EMOTES))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_EMOTES))
 			Event.bNotification = true;
 		Event.strValue = strNick + _T(" ") + strText;
 		break;
 	case GC_EVENT_MESSAGE:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_MESSAGES))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_MESSAGES))
 			Event.bNotification = true;
 		Event.strValue = strNick + _T(": ") + strText;
 		break;
@@ -1264,63 +1214,58 @@ int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam)
 		// Add the user to the list
 		pHistory->LUsers.push_back(toTstring(gce->ptszNick));
 
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
 			Event.bNotification = true;
 		// Skip join event for user
-		if(gce->bIsMe)
+		if (gce->bIsMe)
 			return 0;
-		Event.strValue = TranslateString(_T("%s has joined the channel"),strNick.c_str());
-		
+		Event.strValue = TranslateString(_T("%s has joined the channel"), strNick.c_str());
+
 		break;
 	case GC_EVENT_PART:
 		{
-			if(CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
+			if (CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
 				Event.bNotification = true;
 			tstring strFullNick = toTstring(gce->ptszNick);
-			Event.strValue = TranslateString(strText.empty()?_T("%s has left"):_T("%s has left: %s"),strNick.c_str(),strText.c_str());
-			if(pHistory)
-			{
+			Event.strValue = TranslateString(strText.empty() ? _T("%s has left") : _T("%s has left: %s"), strNick.c_str(), strText.c_str());
+			if (pHistory) {
 				// Remove the user from the list
 				list<tstring>::iterator iter = pHistory->LUsers.begin();
-				while(iter != pHistory->LUsers.end())
-				{
-					if((*iter) == strFullNick)
-					{
+				while (iter != pHistory->LUsers.end()) {
+					if ((*iter) == strFullNick) {
 						pHistory->LUsers.erase(iter);
 						break;
 					}
 					iter++;
-				}	
+				}
 			}
 			break;
 		}
 	case GC_EVENT_QUIT:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
 			Event.bNotification = true;
-		Event.strValue = TranslateString(strText.empty()?_T("%s has disconnected"):_T("%s has disconnected: %s"),strNick.c_str(),strText.c_str());
+		Event.strValue = TranslateString(strText.empty() ? _T("%s has disconnected") : _T("%s has disconnected: %s"), strNick.c_str(), strText.c_str());
 		break;
 	case GC_EVENT_KICK:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
 			Event.bNotification = true;
-		Event.strValue = TranslateString(_T("%s has kicked %s: %s"),strStatus.c_str(),strNick.c_str(),strText.c_str());
+		Event.strValue = TranslateString(_T("%s has kicked %s: %s"), strStatus.c_str(), strNick.c_str(), strText.c_str());
 		break;
 	case GC_EVENT_NICK:
 		{
-			if(CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
+			if (CConfig::GetBoolSetting(NOTIFY_IRC_USERS))
 				Event.bNotification = true;
 			tstring strFullNick = toTstring(gce->ptszNick);
-			
-			if(CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strText.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
+
+			if (CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strText.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
 				strText = strText.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
-	
-			Event.strValue =  TranslateString(_T("%s is now known as %s"),strNick.c_str(),strText.c_str());
-			if(pHistory)
-			{
+
+			Event.strValue = TranslateString(_T("%s is now known as %s"), strNick.c_str(), strText.c_str());
+			if (pHistory) {
 				// change the nick in the userlist
 				list<tstring>::iterator iter = pHistory->LUsers.begin();
-				while(iter != pHistory->LUsers.end())
-				{
-					if((*iter) == strFullNick)
+				while (iter != pHistory->LUsers.end()) {
+					if ((*iter) == strFullNick)
 						(*iter) = strText;
 					iter++;
 				}
@@ -1328,89 +1273,83 @@ int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam)
 			break;
 		}
 	case GC_EVENT_NOTICE:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_NOTICES))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_NOTICES))
 			Event.bNotification = true;
-		Event.strValue = TranslateString(_T("Notice from %s: %s"),strNick.c_str(),strText.c_str());
+		Event.strValue = TranslateString(_T("Notice from %s: %s"), strNick.c_str(), strText.c_str());
 		break;
 	case GC_EVENT_TOPIC:
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_CHANNEL))
+		if (CConfig::GetBoolSetting(NOTIFY_IRC_CHANNEL))
 			Event.bNotification = true;
-		Event.strValue = TranslateString(_T("Topic is now '%s' (set by %s)"),strText.c_str(),strNick.c_str());
+		Event.strValue = TranslateString(_T("Topic is now '%s' (set by %s)"), strText.c_str(), strNick.c_str());
 		break;
 	case GC_EVENT_ADDSTATUS:
-	{
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_STATUS))
-			Event.bNotification = true;
-		tstring strNick2 = toTstring(gce->ptszStatus);
-		if(CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strNick2.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
-			strNick2 = strNick2.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
+		{
+			if (CConfig::GetBoolSetting(NOTIFY_IRC_STATUS))
+				Event.bNotification = true;
+			tstring strNick2 = toTstring(gce->ptszStatus);
+			if (CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strNick2.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
+				strNick2 = strNick2.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
 
-		Event.strValue = TranslateString(_T("%s enables '%s' for %s"),strText.c_str(),strNick2.c_str(),strNick.c_str());
-		break;
-	}
+			Event.strValue = TranslateString(_T("%s enables '%s' for %s"), strText.c_str(), strNick2.c_str(), strNick.c_str());
+			break;
+		}
 	case GC_EVENT_REMOVESTATUS:
-	{
-		if(CConfig::GetBoolSetting(NOTIFY_IRC_STATUS))
-		Event.bNotification = true;
-		tstring strNick2 = toTstring(gce->ptszStatus);
-		if(CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strNick2.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
-			strNick2 = strNick2.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
+		{
+			if (CConfig::GetBoolSetting(NOTIFY_IRC_STATUS))
+				Event.bNotification = true;
+			tstring strNick2 = toTstring(gce->ptszStatus);
+			if (CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF) && strNick2.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
+				strNick2 = strNick2.erase(CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) + _T("...");
 
-		Event.strValue = TranslateString(_T("%s disables '%s' for %s"),strText.c_str(),strNick2.c_str(),strNick.c_str());
-		break;
-	}
+			Event.strValue = TranslateString(_T("%s disables '%s' for %s"), strText.c_str(), strNick2.c_str(), strNick.c_str());
+			break;
+		}
 	default:
 		TRACE(_T("OK!\n"));
 		return 0;
 	}
-	if(gce->bIsMe || gcd->ptszID == NULL)
+	if (gce->bIsMe || gcd->ptszID == NULL)
 		Event.bNotification = false;
 
 	// set the event's timestamp
 	Event.bTime = true;
 	time_t now;
 	time(&now);
-	localtime_s(&Event.Time,&now);
-	
+	localtime_s(&Event.Time, &now);
+
 	SIRCMessage IRCMsg;
 	IRCMsg.bIsMe = (gce->bIsMe != 0);
 	IRCMsg.strMessage = Event.strValue;
 	IRCMsg.Time = Event.Time;
 
-	if(pHistory)
-	{
+	if (pHistory) {
 		pHistory->LMessages.push_back(IRCMsg);
 
 		// Limit the size to the session logsize
-		if(pHistory->LMessages.size() > CConfig::GetIntSetting(SESSION_LOGSIZE))
+		if (pHistory->LMessages.size() > CConfig::GetIntSetting(SESSION_LOGSIZE))
 			pHistory->LMessages.pop_front();
 	}
-	else if(gce->ptszNick && gcd->iType == GC_EVENT_QUIT)
-	{
-		tstring strNick = toTstring(gce->ptszNick);
-		
-		if(!CAppletManager::GetInstance()->m_LIRCHistorys.empty())
-		{
+	else if (gce->ptszNick && gcd->iType == GC_EVENT_QUIT) {
+		strNick = toTstring(gce->ptszNick);
+
+		if (!CAppletManager::GetInstance()->m_LIRCHistorys.empty()) {
 			list<CIRCHistory*>::iterator iter = CAppletManager::GetInstance()->m_LIRCHistorys.begin();
 			list<tstring>::iterator nickiter;
-			while(iter != CAppletManager::GetInstance()->m_LIRCHistorys.end())
-			{
+			while (iter != CAppletManager::GetInstance()->m_LIRCHistorys.end()) {
 				nickiter = (*iter)->LUsers.begin();
-				while(nickiter != (*iter)->LUsers.end())
-				{
-					if((*nickiter) == strNick)
-					{
+				while (nickiter != (*iter)->LUsers.end()) {
+					if ((*nickiter) == strNick) {
 						(*iter)->LMessages.push_back(IRCMsg);
 						// Limit the size to the session logsize
-						if((*iter)->LMessages.size() > CConfig::GetIntSetting(SESSION_LOGSIZE))
+						if ((*iter)->LMessages.size() > CConfig::GetIntSetting(SESSION_LOGSIZE))
 							(*iter)->LMessages.pop_front();
 
 						(*iter)->LUsers.erase(nickiter);
-						
+
 						Event.hContact = (*iter)->hContact;
-						tstring strName = CAppletManager::GetContactDisplayname((*iter)->hContact,true);
-						Event.strDescription = strName + _T(" - ")+Event.strValue;
-						Event.strSummary = _T("(") + toTstring(gcd->pszModule) + _T(") ")+strName;
+						tstring strName = CAppletManager::GetContactDisplayname((*iter)->hContact, true);
+						Event.strDescription = strName + _T(" - ") + Event.strValue;
+						Event.strSummary = _T("(") + toTstring(gcd->pszModule) + _T(") ") + strName;
 						CAppletManager::GetInstance()->HandleEvent(&Event);
 						break;
 					}
@@ -1422,26 +1361,24 @@ int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam)
 		TRACE(_T("OK!\n"));
 		return 0;
 	}
-	else if(gcd->ptszID != NULL)
-	{
+	if (gcd->ptszID != NULL) {
 		TRACE(_T("OK!\n"));
 		return 0;
 	}
 
-	if(pHistory)
-	{
+	if (pHistory) {
 		tstring strChannel = pHistory->strChannel;
-		if(CConfig::GetBoolSetting(NOTIFY_CHANNELCUTOFF) && strChannel.length() > CConfig::GetIntSetting(NOTIFY_CHANNELCUTOFF_OFFSET)) {
+		if (CConfig::GetBoolSetting(NOTIFY_CHANNELCUTOFF) && strChannel.length() > CConfig::GetIntSetting(NOTIFY_CHANNELCUTOFF_OFFSET)) {
 			strChannel = strChannel.erase(CConfig::GetIntSetting(NOTIFY_CHANNELCUTOFF_OFFSET)) + _T("...");
 		}
-		Event.strDescription = strChannel + _T(" - ")+Event.strValue;
-		Event.strSummary = _T("(") + toTstring(gcd->pszModule) + _T(") ")+pHistory->strChannel;
+		Event.strDescription = strChannel + _T(" - ") + Event.strValue;
+		Event.strSummary = _T("(") + toTstring(gcd->pszModule) + _T(") ") + pHistory->strChannel;
 	}
 	else
 		Event.strDescription = Event.strValue;
 
 	TRACE(_T("OK!\n"));
-	
+
 	CAppletManager::GetInstance()->HandleEvent(&Event);
 
 	return 0;
@@ -1490,11 +1427,11 @@ int CAppletManager::HookEventAdded(WPARAM wParam, LPARAM lParam)
 {
 	CEvent Event;
 
-	if(CAppletManager::TranslateDBEvent(&Event,wParam,lParam))
+	if (CAppletManager::TranslateDBEvent(&Event, wParam, lParam))
 		CAppletManager::GetInstance()->HandleEvent(&Event);
 
 	return 0;
-} 
+}
 
 //************************************************************************
 // contact status change hook function
@@ -1503,7 +1440,7 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
 
-	if ((wParam == 0) || (mir_strcmp(cws->szSetting,"Status") != NULL))
+	if ((wParam == 0) || (mir_strcmp(cws->szSetting, "Status") != NULL))
 		return 0;
 
 
@@ -1519,76 +1456,71 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam)
 	tstring strProto = toTstring(szProto);
 
 	CProtocolData *pProtocolData = CAppletManager::GetInstance()->GetProtocolData(toTstring(szProto));
-	if(pProtocolData == NULL)
+	if (pProtocolData == NULL)
 		return false;
-	
+
 	// Fetch the contacts name
-	tstring strName = CAppletManager::GetContactDisplayname(Event.hContact,true);
-	
+	tstring strName = CAppletManager::GetContactDisplayname(Event.hContact, true);
+
 	// Get status String
 	Event.strValue = toTstring(pcli->pfnGetStatusModeDescription(iStatus, 0));
-	
+
 	// check if this is an irc protocol
 	CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(strProto);
 
 	// Contact signed on
-	if(iOldStatus == ID_STATUS_OFFLINE && iStatus != ID_STATUS_OFFLINE)
-	{
-		if(CConfig::GetBoolSetting(NOTIFY_SIGNOFF))
+	if (iOldStatus == ID_STATUS_OFFLINE && iStatus != ID_STATUS_OFFLINE) {
+		if (CConfig::GetBoolSetting(NOTIFY_SIGNOFF))
 			Event.bNotification = true;
 
 		Event.eType = EVENT_SIGNED_ON;
-		if(pIRCCon && db_get_b(Event.hContact, szProto, "ChatRoom", 0) != 0)
-		{
-			Event.strDescription = TranslateString(_T("Joined %s"),strName.c_str());
-			
+		if (pIRCCon && db_get_b(Event.hContact, szProto, "ChatRoom", 0) != 0) {
+			Event.strDescription = TranslateString(_T("Joined %s"), strName.c_str());
+
 			DBVARIANT dbv;
-			if (db_get_ts(Event.hContact, szProto, "Nick", &dbv)) 
+			if (db_get_ts(Event.hContact, szProto, "Nick", &dbv))
 				return 0;
-			CAppletManager::GetInstance()->CreateIRCHistory(Event.hContact,dbv.ptszVal);
+			CAppletManager::GetInstance()->CreateIRCHistory(Event.hContact, dbv.ptszVal);
 			db_free(&dbv);
 		}
 		else
-			Event.strDescription = TranslateString(_T("%s signed on (%s)"),strName.c_str(),Event.strValue.c_str());
+			Event.strDescription = TranslateString(_T("%s signed on (%s)"), strName.c_str(), Event.strValue.c_str());
 	}
 	// Contact signed off
-	else if(iStatus == ID_STATUS_OFFLINE && iOldStatus != ID_STATUS_OFFLINE)
-	{
-		if(CConfig::GetBoolSetting(NOTIFY_SIGNON))
+	else if (iStatus == ID_STATUS_OFFLINE && iOldStatus != ID_STATUS_OFFLINE) {
+		if (CConfig::GetBoolSetting(NOTIFY_SIGNON))
 			Event.bNotification = true;
 
 		Event.eType = EVENT_SIGNED_OFF;
-		if(pIRCCon &&  db_get_b(Event.hContact, szProto, "ChatRoom", 0) != 0)
-		{
-			Event.strDescription = TranslateString(_T("Left %s"),strName.c_str());
+		if (pIRCCon &&  db_get_b(Event.hContact, szProto, "ChatRoom", 0) != 0) {
+			Event.strDescription = TranslateString(_T("Left %s"), strName.c_str());
 			// delete IRC-Channel history
 			CAppletManager::GetInstance()->DeleteIRCHistory(Event.hContact);
 		}
 		else
-			Event.strDescription = TranslateString(_T("%s signed off"),strName.c_str());
+			Event.strDescription = TranslateString(_T("%s signed off"), strName.c_str());
 	}
 	// Contact changed status
-	else if(iStatus != iOldStatus)
-	{	
-		if(CConfig::GetBoolSetting(NOTIFY_STATUS))
+	else if (iStatus != iOldStatus) {
+		if (CConfig::GetBoolSetting(NOTIFY_STATUS))
 			Event.bNotification = true;
 
 		Event.eType = EVENT_STATUS;
-		Event.strDescription = TranslateString(_T("%s is now %s"),strName.c_str(),Event.strValue.c_str());
+		Event.strDescription = TranslateString(_T("%s is now %s"), strName.c_str(), Event.strValue.c_str());
 	}
 	// ignore remaining events
 	else
 		return 0;
 
-	if(CConfig::GetBoolSetting(NOTIFY_SHOWPROTO))
-		Event.strDescription = _T("(")+strProto+_T(") ") + Event.strDescription;
+	if (CConfig::GetBoolSetting(NOTIFY_SHOWPROTO))
+		Event.strDescription = _T("(") + strProto + _T(") ") + Event.strDescription;
+
 
-	
 
 	Event.strSummary = TranslateString(_T("Contactlist event"));
 
 	// Block notifications after connecting/disconnecting
-	if(pProtocolData->iStatus == ID_STATUS_OFFLINE || (DWORD)pProtocolData->lTimeStamp + PROTOCOL_NOTIFY_DELAY > GetTickCount())
+	if (pProtocolData->iStatus == ID_STATUS_OFFLINE || (DWORD)pProtocolData->lTimeStamp + PROTOCOL_NOTIFY_DELAY > GetTickCount())
 		Event.bNotification = false;
 
 	//CAppletManager::GetInstance()->ActivateNotificationScreen(&Event);
@@ -1602,32 +1534,29 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam)
 //************************************************************************
 int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam)
 {
-	ACKDATA *pAck = (ACKDATA *) lParam;
-  
-    if(lParam == 0)
+	ACKDATA *pAck = (ACKDATA *)lParam;
+
+	if (lParam == 0)
 		return 0;
-	
+
 	// Prepare message and append to queue
 	CEvent Event;
 
 	// Message job handling
-	if(pAck->type == ACKTYPE_MESSAGE)
-	{
+	if (pAck->type == ACKTYPE_MESSAGE) {
 		list<SMessageJob*>::iterator iter = CAppletManager::GetInstance()->m_MessageJobs.begin();
-		while(iter != CAppletManager::GetInstance()->m_MessageJobs.end())
-		{
-			if((*iter)->hEvent == (MEVENT)pAck->hProcess && (*iter)->hContact == pAck->hContact)
-			{
+		while (iter != CAppletManager::GetInstance()->m_MessageJobs.end()) {
+			if ((*iter)->hEvent == (MEVENT)pAck->hProcess && (*iter)->hContact == pAck->hContact) {
 				Event.eType = EVENT_MESSAGE_ACK;
 				Event.hValue = (MEVENT)pAck->hProcess;
 				Event.hContact = pAck->hContact;
 				Event.iValue = pAck->result;
-				if(pAck->lParam != 0)
+				if (pAck->lParam != 0)
 					Event.strValue = toTstring((char*)pAck->lParam);
-				else 
+				else
 					Event.strValue = _T("");
 
-				if(Event.iValue == ACKRESULT_SUCCESS)
+				if (Event.iValue == ACKRESULT_SUCCESS)
 					CAppletManager::GetInstance()->FinishMessageJob((*iter));
 				else
 					CAppletManager::GetInstance()->CancelMessageJob((*iter));
@@ -1640,45 +1569,41 @@ int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam)
 		}
 	}
 	// protocol status changes
-	else if(pAck->type == ACKTYPE_STATUS && pAck->result == ACKRESULT_SUCCESS)
-	{
+	else if (pAck->type == ACKTYPE_STATUS && pAck->result == ACKRESULT_SUCCESS) {
 		int iOldStatus = (int)pAck->hProcess;
 		int iNewStatus = pAck->lParam;
-		
+
 		tstring strProto = toTstring(pAck->szModule);
-		
+
 		// ignore metacontacts status changes
-		if(toLower(strProto) == _T("metacontacts"))
+		if (toLower(strProto) == _T("metacontacts"))
 			return 0;
 
 		CProtocolData *pProtoData = CAppletManager::GetInstance()->GetProtocolData(strProto);
-		if(pProtoData == NULL)
+		if (pProtoData == NULL)
 			return 0;
 
-		if(iNewStatus == ID_STATUS_CONNECTING)
+		if (iNewStatus == ID_STATUS_CONNECTING)
 			return 0;
 
-		if(iNewStatus == ID_STATUS_OFFLINE)
-		{
-			if(CConfig::GetBoolSetting(NOTIFY_PROTO_SIGNOFF))
+		if (iNewStatus == ID_STATUS_OFFLINE) {
+			if (CConfig::GetBoolSetting(NOTIFY_PROTO_SIGNOFF))
 				Event.bNotification = true;
 			Event.eType = EVENT_PROTO_DISCONNECTED;
 		}
-		else if(iNewStatus != ID_STATUS_OFFLINE && iOldStatus == ID_STATUS_CONNECTING)
-		{
-			if(CConfig::GetBoolSetting(NOTIFY_PROTO_SIGNON))
+		else if (iNewStatus != ID_STATUS_OFFLINE && iOldStatus == ID_STATUS_CONNECTING) {
+			if (CConfig::GetBoolSetting(NOTIFY_PROTO_SIGNON))
 				Event.bNotification = true;
 			Event.eType = EVENT_PROTO_CONNECTED;
 		}
-		else
-		{
-			if(CConfig::GetBoolSetting(NOTIFY_PROTO_STATUS))
+		else {
+			if (CConfig::GetBoolSetting(NOTIFY_PROTO_STATUS))
 				Event.bNotification = true;
 			Event.eType = EVENT_PROTO_STATUS;
 		}
 
 		// Skip connecting status
-		if(iNewStatus == ID_STATUS_CONNECTING)
+		if (iNewStatus == ID_STATUS_CONNECTING)
 			return 0;
 
 		pProtoData->iStatus = iNewStatus;
@@ -1688,10 +1613,10 @@ int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam)
 
 		// set the event description / summary
 		tstring strStatus = toTstring(pcli->pfnGetStatusModeDescription(iNewStatus, 0));
-		Event.strDescription = _T("(") + Event.strValue + _T(") ")+ TranslateString(_T("You are now %s"),strStatus.c_str());
+		Event.strDescription = _T("(") + Event.strValue + _T(") ") + TranslateString(_T("You are now %s"), strStatus.c_str());
 		Event.strSummary = TranslateString(_T("Protocol status change"));
 
-		if(Event.eType != EVENT_PROTO_STATUS)
+		if (Event.eType != EVENT_PROTO_STATUS)
 			pProtoData->lTimeStamp = GetTickCount();
 
 		CAppletManager::GetInstance()->HandleEvent(&Event);
@@ -1725,9 +1650,9 @@ int CAppletManager::HookContactDeleted(WPARAM wParam, LPARAM)
 	Event.bNotification = CConfig::GetBoolSetting(NOTIFY_CONTACTS);
 	Event.bLog = Event.bNotification;
 
-	tstring strName = CAppletManager::GetContactDisplayname(Event.hContact,true);
-	
-	Event.strDescription = TranslateString(_T("%s was deleted from contactlist!"),strName.c_str());
+	tstring strName = CAppletManager::GetContactDisplayname(Event.hContact, true);
+
+	Event.strDescription = TranslateString(_T("%s was deleted from contactlist!"), strName.c_str());
 
 	CAppletManager::GetInstance()->HandleEvent(&Event);
 	return 0;
@@ -1736,51 +1661,51 @@ int CAppletManager::HookContactDeleted(WPARAM wParam, LPARAM)
 //************************************************************************
 // setting changed hook function
 //************************************************************************
-int CAppletManager::HookSettingChanged(WPARAM hContact,LPARAM lParam)
+int CAppletManager::HookSettingChanged(WPARAM hContact, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam;
-	
+
 	CEvent Event;
 	Event.hContact = hContact;
 
-	if(!mir_strcmp(dbcws->szSetting,"Nick") || !mir_strcmp(dbcws->szSetting,"MyHandle")) {
-		DBVARIANT dbv={0};
+	if (!mir_strcmp(dbcws->szSetting, "Nick") || !mir_strcmp(dbcws->szSetting, "MyHandle")) {
+		DBVARIANT dbv = { 0 };
 		// if the protocol nick has changed, check if a custom handle is set
-		if(!mir_strcmp(dbcws->szSetting,"Nick")) {
+		if (!mir_strcmp(dbcws->szSetting, "Nick")) {
 			if (!db_get_ts(Event.hContact, "CList", "MyHandle", &dbv)) {
 				// handle found, ignore this event
-				if(dbv.pszVal && mir_strlen(dbv.pszVal)>0)
+				if (dbv.pszVal && mir_strlen(dbv.pszVal) > 0)
 					return 0;
 			}
 			db_free(&dbv);
 		}
 
 		Event.eType = EVENT_CONTACT_NICK;
-		if(dbcws->value.type != DBVT_DELETED && dbcws->value.pszVal && mir_strlen(dbcws->value.pszVal)>0) {
-			if(dbcws->value.type == DBVT_UTF8)
+		if (dbcws->value.type != DBVT_DELETED && dbcws->value.pszVal && mir_strlen(dbcws->value.pszVal) > 0) {
+			if (dbcws->value.type == DBVT_UTF8)
 				Event.strValue = Utf8_Decode(dbcws->value.pszVal);
 			else
 				Event.strValue = toTstring(dbcws->value.pszVal);
 		}
 		else {
 			char *szProto = GetContactProto(Event.hContact);
-			if (db_get_ts(Event.hContact, szProto, "Nick", &dbv)) 
+			if (db_get_ts(Event.hContact, szProto, "Nick", &dbv))
 				return 0;
 			Event.strValue = dbv.ptszVal;
 			db_free(&dbv);
 		}
 	}
-	else if(!mir_strcmp(dbcws->szModule,"CList")) {
-		if(!mir_strcmp(dbcws->szSetting,"Hidden")) {
+	else if (!mir_strcmp(dbcws->szModule, "CList")) {
+		if (!mir_strcmp(dbcws->szSetting, "Hidden")) {
 			Event.eType = EVENT_CONTACT_HIDDEN;
-			Event.iValue = db_get_b(hContact,"CList","Hidden",0);
+			Event.iValue = db_get_b(hContact, "CList", "Hidden", 0);
 		}
-		else if(!mir_strcmp(dbcws->szSetting,"Group")) {
+		else if (!mir_strcmp(dbcws->szSetting, "Group")) {
 			Event.eType = EVENT_CONTACT_GROUP;
 			DBVARIANT dbv;
-			int res = db_get_ts(hContact, "CList", "Group",	&dbv);
-			if(!res)
-					Event.strValue = dbv.ptszVal;
+			int res = db_get_ts(hContact, "CList", "Group", &dbv);
+			if (!res)
+				Event.strValue = dbv.ptszVal;
 			db_free(&dbv);
 		}
 		else return 0;