hello, Unix.

phase 1: removing _T()

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

1 files changed, 130 insertions, 130 deletions

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index e5f6df0342..7d49935abc 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -63,104 +63,104 @@ static struct
 } sttNodeIcons[] =

 {

 	//	standard identities: http://www.xmpp.org/registrar/disco-categories.html#directory

-	//	{NULL,	_T("account"),			_T("admin"),		NULL,			0},

-	//	{NULL,	_T("account"),			_T("anonymous"),	NULL,			0},

-	//	{NULL,	_T("account"),			_T("registered"),	NULL,			0},

-		{NULL,	_T("account"),			NULL,				NULL,			SKINICON_STATUS_ONLINE},

-

-		//	{NULL,	_T("auth"),				_T("cert"),			NULL,			0},

-		//	{NULL,	_T("auth"),				_T("generic"),		NULL,			0},

-		//	{NULL,	_T("auth"),				_T("ldap"),			NULL,			0},

-		//	{NULL,	_T("auth"),				_T("ntlm"),			NULL,			0},

-		//	{NULL,	_T("auth"),				_T("pam"),			NULL,			0},

-		//	{NULL,	_T("auth"),				_T("radius"),		NULL,			0},

-			{NULL,	_T("auth"),				NULL,				"key",			0},

-

-	///	{NULL,	_T("automation"),		_T("command-list"),	NULL,			0},

-	///	{NULL,	_T("automation"),		_T("command-node"),	NULL,			0},

-	//	{NULL,	_T("automation"),		_T("rpc"),			NULL,			0},

-	//	{NULL,	_T("automation"),		_T("soap"),			NULL,			0},

-		{NULL,	_T("automation"),		NULL,				"adhoc",		0},

-

-	//	{NULL,	_T("client"),			_T("bot"),			NULL,			0},

-	//	{NULL,	_T("client"),			_T("console"),		NULL,			0},

-	//	{NULL,	_T("client"),			_T("handheld"),		NULL,			0},

-	//	{NULL,	_T("client"),			_T("pc"),			NULL,			0},

-	//	{NULL,	_T("client"),			_T("phone"),		NULL,			0},

-	//	{NULL,	_T("client"),			_T("web"),			NULL,			0},

-		{NULL,	_T("client"),			NULL,				NULL,			SKINICON_STATUS_ONLINE},

-

-	//	{NULL,	_T("collaboration"),	_T("whiteboard"),	NULL,			0},

-		{NULL,	_T("collaboration"),	NULL,				"group",		0},

-

-	//	{NULL,	_T("component"),		_T("archive"),		NULL,			0},

-	//	{NULL,	_T("component"),		_T("c2s"),			NULL,			0},

-	//	{NULL,	_T("component"),		_T("generic"),		NULL,			0},

-	//	{NULL,	_T("component"),		_T("load"),			NULL,			0},

-	//	{NULL,	_T("component"),		_T("log"),			NULL,			0},

-	//	{NULL,	_T("component"),		_T("presence"),		NULL,			0},

-	//	{NULL,	_T("component"),		_T("router"),		NULL,			0},

-	//	{NULL,	_T("component"),		_T("s2s"),			NULL,			0},

-	//	{NULL,	_T("component"),		_T("sm"),			NULL,			0},

-	//	{NULL,	_T("component"),		_T("stats"),		NULL,			0},

-

-	//	{NULL,	_T("conference"),		_T("irc"),			NULL,			0},

-	//	{NULL,	_T("conference"),		_T("text"),			NULL,			0},

-		{NULL,	_T("conference"),		NULL,				"group",		0},

-

-		{NULL,	_T("directory"),		_T("chatroom"),		"group",		0},

-		{NULL,	_T("directory"),		_T("group"),		"group",		0},

-		{NULL,	_T("directory"),		_T("user"),			NULL,			SKINICON_OTHER_FINDUSER},

-	//	{NULL,	_T("directory"),		_T("waitinglist"),	NULL,			0},

-		{NULL,	_T("directory"),		NULL,				NULL,			SKINICON_OTHER_SEARCHALL},

-

-		{NULL,	_T("gateway"),			_T("aim"),			"AIM",			SKINICON_STATUS_ONLINE},

-		{NULL,	_T("gateway"),			_T("gadu-gadu"),	"GG",			SKINICON_STATUS_ONLINE},

-	//	{NULL,	_T("gateway"),			_T("http-ws"),		NUL,			0},

-		{NULL,	_T("gateway"),			_T("icq"),			"ICQ",			SKINICON_STATUS_ONLINE},

-		{NULL,	_T("gateway"),			_T("msn"),			"MSN",			SKINICON_STATUS_ONLINE},

-		{NULL,	_T("gateway"),			_T("qq"),			"QQ",			SKINICON_STATUS_ONLINE},

-	//	{NULL,	_T("gateway"),			_T("sms"),			NULL,			0},

-	//	{NULL,	_T("gateway"),			_T("smtp"),			NULL,			0},

-		{NULL,	_T("gateway"),			_T("tlen"),			"TLEN",			SKINICON_STATUS_ONLINE},

-		{NULL,	_T("gateway"),			_T("yahoo"),		"YAHOO",		SKINICON_STATUS_ONLINE},

-		{NULL,	_T("gateway"),			NULL,				"Agents",		0},

-

-	//	{NULL,	_T("headline"),			_T("newmail"),		NULL,			0},

-		{NULL,	_T("headline"),			_T("rss"),			"node_rss",		0},

-		{NULL,	_T("headline"),			_T("weather"),		"node_weather",	0},

-

-	//	{NULL,	_T("hierarchy"),		_T("branch"),		NULL,			0},

-	//	{NULL,	_T("hierarchy"),		_T("leaf"),			NULL,			0},

-

-	//	{NULL,	_T("proxy"),			_T("bytestreams"),	NULL,			0},

-		{NULL,	_T("proxy"),			NULL,				NULL,			SKINICON_EVENT_FILE},

-

-	//	{NULL,	_T("pubsub"),			_T("collection"),	NULL,			0},

-	//	{NULL,	_T("pubsub"),			_T("leaf"),			NULL,			0},

-	//	{NULL,	_T("pubsub"),			_T("pep"),			NULL,			0},

-	//	{NULL,	_T("pubsub"),			_T("service"),		NULL,			0},

-

-	//	{NULL,	_T("server"),			_T("im"),			NULL,			0},

-		{NULL,	_T("server"),			NULL,				"node_server",	0},

-

-	//	{NULL,	_T("store"),			_T("berkeley"),		NULL,			0},

-	///	{NULL,	_T("store"),			_T("file"),			NULL,			0},

-	//	{NULL,	_T("store"),			_T("generic"),		NULL,			0},

-	//	{NULL,	_T("store"),			_T("ldap"),			NULL,			0},

-	//	{NULL,	_T("store"),			_T("mysql"),		NULL,			0},

-	//	{NULL,	_T("store"),			_T("oracle"),		NULL,			0},

-	//	{NULL,	_T("store"),			_T("postgres"),		NULL,			0},

-		{NULL,	_T("store"),			NULL,				"node_store",	0},

+	//	{NULL,	L"account",			L"admin",		NULL,			0},

+	//	{NULL,	L"account",			L"anonymous",	NULL,			0},

+	//	{NULL,	L"account",			L"registered",	NULL,			0},

+		{NULL,	L"account",			NULL,				NULL,			SKINICON_STATUS_ONLINE},

+

+		//	{NULL,	L"auth",				L"cert",			NULL,			0},

+		//	{NULL,	L"auth",				L"generic",		NULL,			0},

+		//	{NULL,	L"auth",				L"ldap",			NULL,			0},

+		//	{NULL,	L"auth",				L"ntlm",			NULL,			0},

+		//	{NULL,	L"auth",				L"pam",			NULL,			0},

+		//	{NULL,	L"auth",				L"radius",		NULL,			0},

+			{NULL,	L"auth",				NULL,				"key",			0},

+

+	///	{NULL,	L"automation",		L"command-list",	NULL,			0},

+	///	{NULL,	L"automation",		L"command-node",	NULL,			0},

+	//	{NULL,	L"automation",		L"rpc",			NULL,			0},

+	//	{NULL,	L"automation",		L"soap",			NULL,			0},

+		{NULL,	L"automation",		NULL,				"adhoc",		0},

+

+	//	{NULL,	L"client",			L"bot",			NULL,			0},

+	//	{NULL,	L"client",			L"console",		NULL,			0},

+	//	{NULL,	L"client",			L"handheld",		NULL,			0},

+	//	{NULL,	L"client",			L"pc",			NULL,			0},

+	//	{NULL,	L"client",			L"phone",		NULL,			0},

+	//	{NULL,	L"client",			L"web",			NULL,			0},

+		{NULL,	L"client",			NULL,				NULL,			SKINICON_STATUS_ONLINE},

+

+	//	{NULL,	L"collaboration",	L"whiteboard",	NULL,			0},

+		{NULL,	L"collaboration",	NULL,				"group",		0},

+

+	//	{NULL,	L"component",		L"archive",		NULL,			0},

+	//	{NULL,	L"component",		L"c2s",			NULL,			0},

+	//	{NULL,	L"component",		L"generic",		NULL,			0},

+	//	{NULL,	L"component",		L"load",			NULL,			0},

+	//	{NULL,	L"component",		L"log",			NULL,			0},

+	//	{NULL,	L"component",		L"presence",		NULL,			0},

+	//	{NULL,	L"component",		L"router",		NULL,			0},

+	//	{NULL,	L"component",		L"s2s",			NULL,			0},

+	//	{NULL,	L"component",		L"sm",			NULL,			0},

+	//	{NULL,	L"component",		L"stats",		NULL,			0},

+

+	//	{NULL,	L"conference",		L"irc",			NULL,			0},

+	//	{NULL,	L"conference",		L"text",			NULL,			0},

+		{NULL,	L"conference",		NULL,				"group",		0},

+

+		{NULL,	L"directory",		L"chatroom",		"group",		0},

+		{NULL,	L"directory",		L"group",		"group",		0},

+		{NULL,	L"directory",		L"user",			NULL,			SKINICON_OTHER_FINDUSER},

+	//	{NULL,	L"directory",		L"waitinglist",	NULL,			0},

+		{NULL,	L"directory",		NULL,				NULL,			SKINICON_OTHER_SEARCHALL},

+

+		{NULL,	L"gateway",			L"aim",			"AIM",			SKINICON_STATUS_ONLINE},

+		{NULL,	L"gateway",			L"gadu-gadu",	"GG",			SKINICON_STATUS_ONLINE},

+	//	{NULL,	L"gateway",			L"http-ws",		NUL,			0},

+		{NULL,	L"gateway",			L"icq",			"ICQ",			SKINICON_STATUS_ONLINE},

+		{NULL,	L"gateway",			L"msn",			"MSN",			SKINICON_STATUS_ONLINE},

+		{NULL,	L"gateway",			L"qq",			"QQ",			SKINICON_STATUS_ONLINE},

+	//	{NULL,	L"gateway",			L"sms",			NULL,			0},

+	//	{NULL,	L"gateway",			L"smtp",			NULL,			0},

+		{NULL,	L"gateway",			L"tlen",			"TLEN",			SKINICON_STATUS_ONLINE},

+		{NULL,	L"gateway",			L"yahoo",		"YAHOO",		SKINICON_STATUS_ONLINE},

+		{NULL,	L"gateway",			NULL,				"Agents",		0},

+

+	//	{NULL,	L"headline",			L"newmail",		NULL,			0},

+		{NULL,	L"headline",			L"rss",			"node_rss",		0},

+		{NULL,	L"headline",			L"weather",		"node_weather",	0},

+

+	//	{NULL,	L"hierarchy",		L"branch",		NULL,			0},

+	//	{NULL,	L"hierarchy",		L"leaf",			NULL,			0},

+

+	//	{NULL,	L"proxy",			L"bytestreams",	NULL,			0},

+		{NULL,	L"proxy",			NULL,				NULL,			SKINICON_EVENT_FILE},

+

+	//	{NULL,	L"pubsub",			L"collection",	NULL,			0},

+	//	{NULL,	L"pubsub",			L"leaf",			NULL,			0},

+	//	{NULL,	L"pubsub",			L"pep",			NULL,			0},

+	//	{NULL,	L"pubsub",			L"service",		NULL,			0},

+

+	//	{NULL,	L"server",			L"im",			NULL,			0},

+		{NULL,	L"server",			NULL,				"node_server",	0},

+

+	//	{NULL,	L"store",			L"berkeley",		NULL,			0},

+	///	{NULL,	L"store",			L"file",			NULL,			0},

+	//	{NULL,	L"store",			L"generic",		NULL,			0},

+	//	{NULL,	L"store",			L"ldap",			NULL,			0},

+	//	{NULL,	L"store",			L"mysql",		NULL,			0},

+	//	{NULL,	L"store",			L"oracle",		NULL,			0},

+	//	{NULL,	L"store",			L"postgres",		NULL,			0},

+		{NULL,	L"store",			NULL,				"node_store",	0},

 

 	//	icons for non-standard identities

-		{NULL,	_T("x-service"),		_T("x-rss"),		"node_rss",		0},

-		{NULL,	_T("application"),		_T("x-weather"),	"node_weather",	0},

-		{NULL,	_T("user"),				NULL,				NULL,			SKINICON_STATUS_ONLINE},

+		{NULL,	L"x-service",		L"x-rss",		"node_rss",		0},

+		{NULL,	L"application",		L"x-weather",	"node_weather",	0},

+		{NULL,	L"user",				NULL,				NULL,			SKINICON_STATUS_ONLINE},

 

 	//	icon suggestions based on supported features

-		{_T("jabber:iq:gateway"),     NULL, NULL,			"Agents",		0},

-		{_T("jabber:iq:search"),      NULL, NULL,			NULL,			SKINICON_OTHER_FINDUSER},

+		{L"jabber:iq:gateway",     NULL, NULL,			"Agents",		0},

+		{L"jabber:iq:search",      NULL, NULL,			NULL,			SKINICON_OTHER_FINDUSER},

 		{ JABBER_FEAT_COMMANDS,       NULL, NULL,			"adhoc",		0},

 		{ JABBER_FEAT_REGISTER,       NULL, NULL,			"key",			0},

 };

@@ -181,11 +181,11 @@ void CJabberProto::OnIqResultServiceDiscoveryInfo(HXML iqNode, CJabberIqInfo *pI
 		else {

 			HXML feature;

 			int i;

-			for (i = 1; (feature = XmlGetNthChild(query, _T("feature"), i)) != NULL; i++)

-				pNode->AddFeature(XmlGetAttrValue(feature, _T("var")));

+			for (i = 1; (feature = XmlGetNthChild(query, L"feature", i)) != NULL; i++)

+				pNode->AddFeature(XmlGetAttrValue(feature, L"var"));

 			HXML identity;

-			for (i = 1; (identity = XmlGetNthChild(query, _T("identity"), i)) != NULL; i++)

-				pNode->AddIdentity(XmlGetAttrValue(identity, _T("category")), XmlGetAttrValue(identity, _T("type")), XmlGetAttrValue(identity, _T("name")));

+			for (i = 1; (identity = XmlGetNthChild(query, L"identity", i)) != NULL; i++)

+				pNode->AddIdentity(XmlGetAttrValue(identity, L"category"), XmlGetAttrValue(identity, L"type"), XmlGetAttrValue(identity, L"name"));

 

 			pNode->SetInfoRequestId(JABBER_DISCO_RESULT_OK);

 			pNode->SetInfoRequestErrorText(NULL);

@@ -224,8 +224,8 @@ void CJabberProto::OnIqResultServiceDiscoveryItems(HXML iqNode, CJabberIqInfo *p
 			pNode->SetItemsRequestId(JABBER_DISCO_RESULT_ERROR);

 		else {

 			HXML item;

-			for (int i = 1; (item = XmlGetNthChild(query, _T("item"), i)) != NULL; i++)

-				pNode->AddChildNode(XmlGetAttrValue(item, _T("jid")), XmlGetAttrValue(item, _T("node")), XmlGetAttrValue(item, _T("name")));

+			for (int i = 1; (item = XmlGetNthChild(query, L"item", i)) != NULL; i++)

+				pNode->AddChildNode(XmlGetAttrValue(item, L"jid"), XmlGetAttrValue(item, L"node"), XmlGetAttrValue(item, L"name"));

 

 			pNode->SetItemsRequestId(JABBER_DISCO_RESULT_OK);

 			pNode->SetItemsRequestErrorText(NULL);

@@ -239,7 +239,7 @@ void CJabberProto::OnIqResultServiceDiscoveryItems(HXML iqNode, CJabberIqInfo *p
 			mir_free(str);

 		}

 		else {

-			pNode->SetItemsRequestErrorText(_T("request timeout."));

+			pNode->SetItemsRequestErrorText(L"request timeout.");

 		}

 		pNode->SetItemsRequestId(JABBER_DISCO_RESULT_ERROR);

 	}

@@ -261,9 +261,9 @@ void CJabberProto::OnIqResultServiceDiscoveryRootInfo(HXML iqNode, CJabberIqInfo
 		HXML query = XmlGetChild(iqNode, "query");

 		if (query) {

 			HXML feature;

-			for (int i = 1; (feature = XmlGetNthChild(query, _T("feature"), i)) != NULL; i++) {

-				if (!mir_tstrcmp(XmlGetAttrValue(feature, _T("var")), (TCHAR *)pInfo->m_pUserData)) {

-					CJabberSDNode *pNode = m_SDManager.AddPrimaryNode(pInfo->GetReceiver(), XmlGetAttrValue(iqNode, _T("node")), NULL);

+			for (int i = 1; (feature = XmlGetNthChild(query, L"feature", i)) != NULL; i++) {

+				if (!mir_tstrcmp(XmlGetAttrValue(feature, L"var"), (TCHAR *)pInfo->m_pUserData)) {

+					CJabberSDNode *pNode = m_SDManager.AddPrimaryNode(pInfo->GetReceiver(), XmlGetAttrValue(iqNode, L"node"), NULL);

 					SendBothRequests(pNode, NULL);

 					break;

 				}

@@ -286,15 +286,15 @@ void CJabberProto::OnIqResultServiceDiscoveryRootItems(HXML iqNode, CJabberIqInf
 		HXML query = XmlGetChild(iqNode, "query");

 		if (query) {

 			HXML item;

-			for (int i = 1; (item = XmlGetNthChild(query, _T("item"), i)) != NULL; i++) {

-				const TCHAR *szJid = XmlGetAttrValue(item, _T("jid"));

-				const TCHAR *szNode = XmlGetAttrValue(item, _T("node"));

+			for (int i = 1; (item = XmlGetNthChild(query, L"item", i)) != NULL; i++) {

+				const TCHAR *szJid = XmlGetAttrValue(item, L"jid");

+				const TCHAR *szNode = XmlGetAttrValue(item, L"node");

 				CJabberIqInfo *pNewInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootInfo, JABBER_IQ_TYPE_GET, szJid);

 				pNewInfo->m_pUserData = pInfo->m_pUserData;

 				pNewInfo->SetTimeout(30000);

 

 				XmlNodeIq iq(pNewInfo);

-				iq << XQUERY(JABBER_FEAT_DISCO_INFO) << XATTR(_T("node"), szNode);

+				iq << XQUERY(JABBER_FEAT_DISCO_INFO) << XATTR(L"node", szNode);

 				XmlAddChild(packet, iq);

 			}

 		}

@@ -319,7 +319,7 @@ BOOL CJabberProto::SendInfoRequest(CJabberSDNode *pNode, HXML parent)
 		XmlNodeIq iq(pInfo);

 		HXML query = iq << XQUERY(JABBER_FEAT_DISCO_INFO);

 		if (pNode->GetNode())

-			XmlAddAttr(query, _T("node"), pNode->GetNode());

+			XmlAddAttr(query, L"node", pNode->GetNode());

 

 		if (parent)

 			XmlAddChild(parent, iq);

@@ -349,7 +349,7 @@ BOOL CJabberProto::SendBothRequests(CJabberSDNode *pNode, HXML parent)
 		XmlNodeIq iq(pInfo);

 		HXML query = iq << XQUERY(JABBER_FEAT_DISCO_INFO);

 		if (pNode->GetNode())

-			XmlAddAttr(query, _T("node"), pNode->GetNode());

+			XmlAddAttr(query, L"node", pNode->GetNode());

 

 		if (parent)

 			XmlAddChild(parent, iq);

@@ -366,7 +366,7 @@ BOOL CJabberProto::SendBothRequests(CJabberSDNode *pNode, HXML parent)
 		XmlNodeIq iq(pInfo);

 		HXML query = iq << XQUERY(JABBER_FEAT_DISCO_ITEMS);

 		if (pNode->GetNode())

-			XmlAddAttr(query, _T("node"), pNode->GetNode());

+			XmlAddAttr(query, L"node", pNode->GetNode());

 

 		if (parent)

 			XmlAddChild(parent, iq);

@@ -437,7 +437,7 @@ void CJabberProto::PerformBrowse(HWND hwndDlg)
 		sttBrowseMode = SD_BROWSE_AGENTS;

 		TCHAR *szServerJid = mir_a2t(m_ThreadInfo->conn.server);

 		CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootItems, JABBER_IQ_TYPE_GET, szServerJid);

-		pInfo->m_pUserData = (void*)_T("jabber:iq:gateway");

+		pInfo->m_pUserData = (void*)L"jabber:iq:gateway";

 		pInfo->SetTimeout(30000);

 		XmlNodeIq iq(pInfo);

 		iq << XQUERY(JABBER_FEAT_DISCO_ITEMS);

@@ -635,12 +635,12 @@ void CJabberDlgDiscovery::OnInitDialog()
 

 	if (m_jid) {

 		SetDlgItemText(m_hwnd, IDC_COMBO_JID, m_jid);

-		SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T(""));

+		SetDlgItemText(m_hwnd, IDC_COMBO_NODE, L"");

 		m_focusEditAfterBrowse = false;

 	}

 	else {

 		SetDlgItemTextA(m_hwnd, IDC_COMBO_JID, m_proto->m_ThreadInfo->conn.server);

-		SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T(""));

+		SetDlgItemText(m_hwnd, IDC_COMBO_NODE, L"");

 		m_focusEditAfterBrowse = true;

 	}

 

@@ -668,7 +668,7 @@ void CJabberDlgDiscovery::OnInitDialog()
 	ListView_InsertColumn(hwndList, 0, &lvc);

 	lvc.cx = m_proto->getWord("discoWnd_cx1", 200);

 	lvc.iSubItem = 1;

-	lvc.pszText = _T("JID");

+	lvc.pszText = L"JID";

 	ListView_InsertColumn(hwndList, 1, &lvc);

 	lvc.cx = m_proto->getWord("discoWnd_cx2", 200);

 	lvc.iSubItem = 2;

@@ -790,7 +790,7 @@ void CJabberDlgDiscovery::btnViewAsList_OnClick(CCtrlButton *)
 void CJabberDlgDiscovery::btnGoHome_OnClick(CCtrlButton *)

 {

 	SetDlgItemTextA(m_hwnd, IDC_COMBO_JID, m_proto->m_ThreadInfo->conn.server);

-	SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T(""));

+	SetDlgItemText(m_hwnd, IDC_COMBO_NODE, L"");

 	PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_BROWSE, 0), 0);

 }

 

@@ -846,8 +846,8 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *)
 		else {

 			res /= 10;

 

-			SetDlgItemText(m_hwnd, IDC_COMBO_JID, _T(""));

-			SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T(""));

+			SetDlgItemText(m_hwnd, IDC_COMBO_JID, L"");

+			SetDlgItemText(m_hwnd, IDC_COMBO_NODE, L"");

 

 			char setting[MAXMODULELABELLENGTH];

 			mir_snprintf(setting, "discoWnd_favJID_%d", res);

@@ -889,7 +889,7 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *)
 			SetDlgItemText(m_hwnd, IDC_COMBO_JID, _T(SD_FAKEJID_CONFERENCES));

 			break;

 		}

-		SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T(""));

+		SetDlgItemText(m_hwnd, IDC_COMBO_NODE, L"");

 		PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_BROWSE, 0), 0);

 	}

 

@@ -948,7 +948,7 @@ INT_PTR CJabberDlgDiscovery::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_JABBER_TRANSPORT_REFRESH:

 		if (m_proto->m_nSDBrowseMode == SD_BROWSE_MYAGENTS) {

 			SetDlgItemText(m_hwnd, IDC_COMBO_JID, _T(SD_FAKEJID_MYAGENTS));

-			SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T(""));

+			SetDlgItemText(m_hwnd, IDC_COMBO_NODE, L"");

 			PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_BROWSE, 0), 0);

 		}

 		break;

@@ -1189,15 +1189,15 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 		{ NULL,                    LPGENT("Add to favorites"),      SD_ACT_FAVORITE},

 		{ NULL,                    LPGENT("Add to roster"),         SD_ACT_ROSTER,           SD_FLG_NONODE | SD_FLG_NOTONROSTER},

 		{ JABBER_FEAT_MUC,         LPGENT("Bookmark chatroom"),     SD_ACT_BOOKMARK,         SD_FLG_NORESOURCE | SD_FLG_HASUSER},

-		{ _T("jabber:iq:search"),  LPGENT("Add search directory"),  SD_ACT_ADDDIRECTORY},

+		{ L"jabber:iq:search",  LPGENT("Add search directory"),  SD_ACT_ADDDIRECTORY},

 		{ JABBER_FEAT_BYTESTREAMS, LPGENT("Use this proxy"),        SD_ACT_PROXY},

 		{0},

 		{ JABBER_FEAT_REGISTER,    LPGENT("Register"),              SD_ACT_REGISTER},

-		{ _T("jabber:iq:gateway"), LPGENT("Unregister"),            SD_ACT_UNREGISTER,       SD_FLG_ONROSTER | SD_FLG_SUBSCRIBED},

+		{ L"jabber:iq:gateway", LPGENT("Unregister"),            SD_ACT_UNREGISTER,       SD_FLG_ONROSTER | SD_FLG_SUBSCRIBED},

 		{ JABBER_FEAT_COMMANDS,    LPGENT("Commands..."),           SD_ACT_ADHOC},

 		{0},

-		{ _T("jabber:iq:gateway"), LPGENT("Logon"),                 SD_ACT_LOGON,            SD_FLG_ONROSTER | SD_FLG_SUBSCRIBED | SD_FLG_ONLINE},

-		{ _T("jabber:iq:gateway"), LPGENT("Logoff"),                SD_ACT_LOGOFF,           SD_FLG_ONROSTER | SD_FLG_SUBSCRIBED | SD_FLG_NOTONLINE},

+		{ L"jabber:iq:gateway", LPGENT("Logon"),                 SD_ACT_LOGON,            SD_FLG_ONROSTER | SD_FLG_SUBSCRIBED | SD_FLG_ONLINE},

+		{ L"jabber:iq:gateway", LPGENT("Logoff"),                SD_ACT_LOGOFF,           SD_FLG_ONROSTER | SD_FLG_SUBSCRIBED | SD_FLG_NOTONLINE},

 		{0},

 		{ NULL,                    LPGENT("Copy JID"),              SD_ACT_COPYJID},

 		{ NULL,                    LPGENT("Copy node name"),        SD_ACT_COPYNODE},

@@ -1345,7 +1345,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 			mir_snprintf(setting, "discoWnd_favJID_%d", count);

 			setTString(setting, pNode->GetJid());

 			mir_snprintf(setting, "discoWnd_favNode_%d", count);

-			setTString(setting, pNode->GetNode() ? pNode->GetNode() : _T(""));

+			setTString(setting, pNode->GetNode() ? pNode->GetNode() : L"");

 			setDword("discoWnd_favCount", ++count);

 		}

 		break;

@@ -1384,7 +1384,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 					item->name = mir_tstrdup(pNode->GetName());

 				}

 

-				item->type = _T("conference");

+				item->type = L"conference";

 				AddEditBookmark(item);

 			}

 		}

@@ -1433,14 +1433,14 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 

 	case SD_ACT_LOGON:

 	case SD_ACT_LOGOFF:

-		m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), pNode->GetJid()) << XATTR(_T("type"), (res != SD_ACT_LOGON) ? _T("unavailable") : NULL));

+		m_ThreadInfo->send(XmlNode(L"presence") << XATTR(L"to", pNode->GetJid()) << XATTR(L"type", (res != SD_ACT_LOGON) ? L"unavailable" : NULL));

 		break;

 

 	case SD_ACT_UNREGISTER:

-		m_ThreadInfo->send(XmlNodeIq(_T("set"), SerialNext(), pNode->GetJid()) << XQUERY(JABBER_FEAT_REGISTER) << XCHILD(_T("remove")));

+		m_ThreadInfo->send(XmlNodeIq(L"set", SerialNext(), pNode->GetJid()) << XQUERY(JABBER_FEAT_REGISTER) << XCHILD(L"remove"));

 

-		m_ThreadInfo->send(XmlNodeIq(_T("set"), SerialNext()) << XQUERY(JABBER_FEAT_IQ_ROSTER)

-			<< XCHILD(_T("item")) << XATTR(_T("jid"), pNode->GetJid()) << XATTR(_T("subscription"), _T("remove")));

+		m_ThreadInfo->send(XmlNodeIq(L"set", SerialNext()) << XQUERY(JABBER_FEAT_IQ_ROSTER)

+			<< XCHILD(L"item") << XATTR(L"jid", pNode->GetJid()) << XATTR(L"subscription", L"remove"));

 		break;

 

 	default: