code cleaning

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

4 files changed, 12 insertions, 12 deletions

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 99ad3ba1b6..4519a679b0 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -185,11 +185,11 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleJoinGroupchat(WPARAM, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM hContact, LPARAM)

 {

-	ptrT jid( getTStringA(hContact, "ChatRoomID"));

+	ptrT jid(getTStringA(hContact, "ChatRoomID"));

 	if (jid == NULL)

 		return 0;

 

-	ptrT nick( getTStringA(hContact, "MyNick"));

+	ptrT nick(getTStringA(hContact, "MyNick"));

 	if (nick == NULL)

 		if ((nick = getTStringA("Nick")) == NULL)

 			return 0;

@@ -340,7 +340,7 @@ void CJabberProto::OnIqResultDiscovery(HXML iqNode, CJabberIqInfo *pInfo)
 			_T(""));

 		mir_free(str);

 	}

-	else 

+	else

 		sttRoomListAppend(hwndList, RoomInfo::ROOM_FAIL,

 			TranslateT("Jabber Error"),

 			TranslateT("Room list request timed out."),

@@ -379,7 +379,7 @@ static void sttJoinDlgShowRecentItems(HWND hwndDlg, int newCount)
 	SetWindowPos(hwndDlg, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top + offset, SWP_NOMOVE | SWP_NOZORDER);

 }

 

-class CJabberDlgGcJoin: public CJabberDlgBase

+class CJabberDlgGcJoin : public CJabberDlgBase

 {

 	typedef CJabberDlgBase CSuper;

 

@@ -422,7 +422,7 @@ void CJabberDlgGcJoin::OnInitDialog()
 	JabberGcRecentInfo *pInfo = NULL;

 	if (m_jid)

 		pInfo = new JabberGcRecentInfo(m_proto, m_jid);

-	else if(OpenClipboard(m_hwnd)) {

+	else if (OpenClipboard(m_hwnd)) {

 		HANDLE hData = GetClipboardData(CF_UNICODETEXT);

 

 		if (hData) {

@@ -869,8 +869,8 @@ void CJabberProto::GroupchatProcessPresence(HXML node)
 		int  newRes = ListAddResource(LIST_CHATROOM, from, status, str, priority, cnick) ? GC_EVENT_JOIN : 0;

 

 		if (pResourceStatus oldRes = ListFindResource(LIST_CHATROOM, from))

-		if ((oldRes->m_iStatus != status) || lstrcmp_null(oldRes->m_tszStatusMessage, str))

-			bStatusChanged = true;

+			if ((oldRes->m_iStatus != status) || lstrcmp_null(oldRes->m_tszStatusMessage, str))

+				bStatusChanged = true;

 

 		// Check additional MUC info for this user

 		if (itemNode != NULL) {

@@ -920,8 +920,8 @@ void CJabberProto::GroupchatProcessPresence(HXML node)
 

 		// show status change if needed

 		if (bStatusChanged)

-		if (pResourceStatus res = ListFindResource(LIST_CHATROOM, from))

-			GcLogShowInformation(item, res, INFO_STATUS);

+			if (pResourceStatus res = ListFindResource(LIST_CHATROOM, from))

+				GcLogShowInformation(item, res, INFO_STATUS);

 

 		// Update groupchat log window

 		GcLogUpdateMemberStatus(item, resource, nick, str, newRes, NULL);

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index a227f52819..420e0561b8 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -420,7 +420,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo)
 		}

 

 		if (name != NULL) {

-			ptrT tszNick(getTStringA("Nick"));

+			ptrT tszNick(getTStringA(hContact, "Nick"));

 			if (tszNick != NULL) {

 				if (mir_tstrcmp(nick, tszNick) != 0)

 					db_set_ts(hContact, "CList", "MyHandle", nick);

diff --git a/protocols/JabberG/src/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp
index 2b5b42deec..820fa3a3e7 100644
--- a/protocols/JabberG/src/jabber_message_handlers.cpp
+++ b/protocols/JabberG/src/jabber_message_handlers.cpp
@@ -48,7 +48,7 @@ BOOL CJabberProto::OnMessageError(HXML node, ThreadData*, CJabberMessageInfo* pI
 			else

 				mir_sntprintf(buf, _T("%s:\n%s"), pInfo->GetFrom(), szErrText);

 

-			 MsgPopup(NULL, buf, TranslateT("Jabber Error"));

+			MsgPopup(NULL, buf, TranslateT("Jabber Error"));

 		}

 		mir_free(szErrText);

 	}

diff --git a/protocols/JabberG/src/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp
index a23eb6f2f6..6800cfb729 100644
--- a/protocols/JabberG/src/jabber_message_manager.cpp
+++ b/protocols/JabberG/src/jabber_message_manager.cpp
@@ -139,7 +139,7 @@ CJabberMessagePermanentInfo* CJabberMessageManager::AddPermanentHandler(
 }

 

 bool CJabberMessageManager::DeletePermanentHandler(CJabberMessagePermanentInfo *pInfo)

-{ 

+{

 	mir_cslock lck(m_cs);

 	return m_arHandlers.remove(pInfo) == 1;

 }