no more TCHARs

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

8 files changed, 55 insertions, 55 deletions

diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index 55c7f046e6..14d8d6030b 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -126,7 +126,7 @@ void FacebookProto::UpdateAvatarWorker(void *)
 std::wstring FacebookProto::GetAvatarFolder()

 {

 	wchar_t path[MAX_PATH];

-	mir_snwprintf(path, L"%s\\%s", VARST(L"%miranda_avatarcache%"), m_tszUserName);

+	mir_snwprintf(path, L"%s\\%s", VARSW(L"%miranda_avatarcache%"), m_tszUserName);

 	return path;

 }

 

diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp
index eeb44b4c59..9720dc06b3 100644
--- a/protocols/FacebookRM/src/chat.cpp
+++ b/protocols/FacebookRM/src/chat.cpp
@@ -101,7 +101,7 @@ int FacebookProto::OnGCEvent(WPARAM, LPARAM lParam)
 		if (!hContact)
 			break;
 
-		CallService(MS_MSG_SENDMESSAGET, hContact);
+		CallService(MS_MSG_SENDMESSAGEW, hContact);
 		break;
 	}
 
@@ -285,8 +285,8 @@ INT_PTR FacebookProto::OnJoinChat(WPARAM hContact, LPARAM)
 	if (!m_enableChat || IsSpecialChatRoom(hContact))
 		return 0;
 
-	ptrW idT(getTStringA(hContact, "ChatRoomID"));
-	ptrW nameT(getTStringA(hContact, "Nick"));
+	ptrW idT(getWStringA(hContact, "ChatRoomID"));
+	ptrW nameT(getWStringA(hContact, "Nick"));
 	ptrA threadId(getStringA(hContact, FACEBOOK_KEY_TID));
 
 	if (!idT || !nameT || !threadId)
@@ -338,7 +338,7 @@ INT_PTR FacebookProto::OnJoinChat(WPARAM hContact, LPARAM)
 
 INT_PTR FacebookProto::OnLeaveChat(WPARAM wParam, LPARAM)
 {
-	ptrW idT(wParam ? getTStringA(wParam, "ChatRoomID") : NULL);
+	ptrW idT(wParam ? getWStringA(wParam, "ChatRoomID") : NULL);
 
 	GCDEST gcd = { m_szModuleName, NULL, GC_EVENT_CONTROL };
 	gcd.ptszID = idT;
diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 63bdec6d32..7c16a70ead 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -727,13 +727,13 @@ void facebook_client::insert_reader(MCONTACT hContact, time_t timestamp, const s
 		std::wstring treaders;
 
 		// Load old readers
-		ptrW told(parent->getTStringA(hContact, FACEBOOK_KEY_MESSAGE_READERS));
+		ptrW told(parent->getWStringA(hContact, FACEBOOK_KEY_MESSAGE_READERS));
 		if (told)
 			treaders = std::wstring(told) + L", ";
 
 		// Append new reader name and remember them
 		treaders += utils::text::prepare_name(treaderName, true);
-		parent->setTString(hContact, FACEBOOK_KEY_MESSAGE_READERS, treaders.c_str());
+		parent->setWString(hContact, FACEBOOK_KEY_MESSAGE_READERS, treaders.c_str());
 	}
 
 	parent->setDword(hContact, FACEBOOK_KEY_MESSAGE_READ, timestamp);
@@ -925,9 +925,9 @@ bool facebook_client::login(const char *username, const char *password)
 
 				// 2) Approve last unknown login
 				if (resp.data.find("name=\"submit[This was me]\"") != std::string::npos) {
-					CMString tszTitle;
+					CMStringW tszTitle;
 					tszTitle.AppendFormat(L"%s - %s", parent->m_tszUserName, TranslateT("Check last login"));
-					CMString tszMessage(TranslateT("Do you recognize this activity?"));
+					CMStringW tszMessage(TranslateT("Do you recognize this activity?"));
 
 					std::string activity = utils::text::slashu_to_utf8(utils::text::source_get_value(&resp.data, 3, "<body", "</strong></div>", "</div>"));
 					activity = utils::text::trim(utils::text::html_entities_decode(utils::text::remove_html(activity)));
@@ -1685,7 +1685,7 @@ bool facebook_client::save_url(const std::string &url, const std::wstring &filen
 		// Create folder if necessary
 		std::wstring dir = filename.substr(0, filename.rfind('\\'));
 		if (_waccess(dir.c_str(), 0))
-			CreateDirectoryTreeT(dir.c_str());
+			CreateDirectoryTreeW(dir.c_str());
 
 		// Write to file
 		FILE *f = _wfopen(filename.c_str(), L"wb");
diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index ad82b665be..8893287514 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -463,12 +463,12 @@ MCONTACT FacebookProto::AddToContactList(facebook_user* fbu, bool force_add, boo
 
 		std::string homepage = FACEBOOK_URL_PROFILE + fbu->user_id;
 		setString(hContact, "Homepage", homepage.c_str());
-		setTString(hContact, "MirVer", fbu->getMirVer());
+		setWString(hContact, "MirVer", fbu->getMirVer());
 
 		db_unset(hContact, "CList", "MyHandle");
 
 		if (m_tszDefaultGroup)
-			db_set_ts(hContact, "CList", "Group", m_tszDefaultGroup);
+			db_set_ws(hContact, "CList", "Group", m_tszDefaultGroup);
 
 		setByte(hContact, FACEBOOK_KEY_CONTACT_TYPE, fbu->type);
 
diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index 8574cf9431..b28dfa3f7a 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -159,7 +159,7 @@ void GetSelectedContacts(FacebookProto *proto, MCONTACT hItem, HWND hwndList, st
 				if (userId)
 					fu->user_id = userId;
 
-				ptrW realName(proto->getTStringA(hItem, FACEBOOK_KEY_NICK));
+				ptrW realName(proto->getWStringA(hItem, FACEBOOK_KEY_NICK));
 				if (realName)
 					fu->real_name = _T2A(realName);
 
@@ -201,7 +201,7 @@ INT_PTR CALLBACK FBMindProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
 		SendDlgItemMessage(hwnd, IDC_MINDMSG, EM_LIMITTEXT, FACEBOOK_MIND_LIMIT, 0);
 		SendDlgItemMessage(hwnd, IDC_URL, EM_LIMITTEXT, 1024, 0);
 
-		ptrW place(data->proto->getTStringA(FACEBOOK_KEY_PLACE));
+		ptrW place(data->proto->getWStringA(FACEBOOK_KEY_PLACE));
 		SetDlgItemText(hwnd, IDC_PLACE, place != NULL ? place : L"Miranda NG");
 
 		bShowContacts = data->proto->getByte("PostStatusExpand", 0) > 0;
@@ -284,7 +284,7 @@ INT_PTR CALLBACK FBMindProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
 			int wall_id = SendDlgItemMessage(hwnd, IDC_WALL, CB_GETCURSEL, 0, 0);
 			int privacy_id = SendDlgItemMessage(hwnd, IDC_PRIVACY, CB_GETCURSEL, 0, 0);
 
-			data->proto->setTString(FACEBOOK_KEY_PLACE, placeT);
+			data->proto->setWString(FACEBOOK_KEY_PLACE, placeT);
 			data->proto->setByte("PostStatusExpand", bShowContacts);
 
 			// remember last wall, only when there are more options
@@ -406,7 +406,7 @@ INT_PTR CALLBACK FBOptionsProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 			if (tstr[0] != '\0')
 			{
 				proto->m_tszDefaultGroup = mir_wstrdup(tstr);
-				proto->setTString(FACEBOOK_KEY_DEF_GROUP, tstr);
+				proto->setWString(FACEBOOK_KEY_DEF_GROUP, tstr);
 				Clist_GroupCreate(0, tstr);
 			}
 			else {
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index cd17067e89..6d4e7471ef 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -775,9 +775,9 @@ int facebook_json_parser::parse_messages(std::string *pData, std::vector<faceboo
 						client = FACEBOOK_CLIENT_OTHER;
 					}
 
-					ptrW oldClient(proto->getTStringA(hContact, "MirVer"));
+					ptrW oldClient(proto->getWStringA(hContact, "MirVer"));
 					if (!oldClient || mir_wstrcmp(oldClient, client))
-						proto->setTString(hContact, "MirVer", client);
+						proto->setWString(hContact, "MirVer", client);
 				}
 			}
 		}
@@ -818,9 +818,9 @@ int facebook_json_parser::parse_messages(std::string *pData, std::vector<faceboo
 				} */
 
 
-				/* ptrW client(getTStringA(fbu->handle, "MirVer"));
+				/* ptrW client(getWStringA(fbu->handle, "MirVer"));
 				if (!client || mir_wstrcmp(client, fbu->getMirVer()))
-					setTString(fbu->handle, "MirVer", fbu->getMirVer());
+					setWString(fbu->handle, "MirVer", fbu->getMirVer());
 				*/
 
 				const JSONNode &a_ = (*itNodes)["a"]; // possible values: 0, 2 (something more?)
@@ -894,9 +894,9 @@ int facebook_json_parser::parse_messages(std::string *pData, std::vector<faceboo
 						client = FACEBOOK_CLIENT_OTHER;
 					}*/
 
-					ptrW oldClient(proto->getTStringA(hContact, "MirVer"));
+					ptrW oldClient(proto->getWStringA(hContact, "MirVer"));
 					if (!oldClient || mir_wstrcmp(oldClient, client))
-						proto->setTString(hContact, "MirVer", client);
+						proto->setWString(hContact, "MirVer", client);
 				}
 			}
 		} else if (t == "ticker_update:home") {
diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index 3a3e00905c..cbc7848bc4 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -294,7 +294,7 @@ void FacebookProto::ProcessUnreadMessage(void *pParam)
 				AddChat(room->thread_id.c_str(), room->chat_name.c_str());
 				hChatContact = ChatIDToHContact(room->thread_id);
 				// Set thread id (TID) for later
-				setTString(hChatContact, FACEBOOK_KEY_TID, room->thread_id.c_str());
+				setWString(hChatContact, FACEBOOK_KEY_TID, room->thread_id.c_str());
 
 				for (std::map<std::string, std::string>::iterator jt = room->participants.begin(); jt != room->participants.end(); ) {
 				AddChatContact(room->thread_id.c_str(), jt->first.c_str(), jt->second.c_str());
@@ -414,7 +414,7 @@ void FacebookProto::LoadLastMessages(void *pParam)
 		AddChat(room->thread_id.c_str(), room->chat_name.c_str());
 		hChatContact = ChatIDToHContact(room->thread_id);
 		// Set thread id (TID) for later
-		setTString(hChatContact, FACEBOOK_KEY_TID, room->thread_id.c_str());
+		setWString(hChatContact, FACEBOOK_KEY_TID, room->thread_id.c_str());
 
 		for (std::map<std::string, std::string>::iterator jt = room->participants.begin(); jt != room->participants.end();) {
 		AddChatContact(room->thread_id.c_str(), jt->first.c_str(), jt->second.c_str());
@@ -805,7 +805,7 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message> &messages, boo
 
 			if (!hChatContact) {
 				// hopefully shouldn't happen, but who knows?
-				debugLog(L"!!! No hChatContact for %s", fbc->thread_id.c_str());
+				debugLogW(L"!!! No hChatContact for %s", fbc->thread_id.c_str());
 				continue;
 			}
 
@@ -1245,7 +1245,7 @@ void FacebookProto::SearchAckThread(void *targ)
 
 				PROTOSEARCHRESULT psr = { 0 };
 				psr.cbSize = sizeof(psr);
-				psr.flags = PSR_TCHAR;
+				psr.flags = PSR_UNICODE;
 				psr.id.w = tid;
 				psr.nick.w = tnick;
 				psr.firstName.w = tname;
@@ -1306,7 +1306,7 @@ void FacebookProto::SearchIdAckThread(void *targ)
 
 				PROTOSEARCHRESULT psr = { 0 };
 				psr.cbSize = sizeof(psr);
-				psr.flags = PSR_TCHAR;
+				psr.flags = PSR_UNICODE;
 				psr.id.w = tid;
 				psr.firstName.w = tname;
 				psr.lastName.w = tsurname;
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 667738556f..4af360a747 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 FacebookProto::FacebookProto(const char* proto_name, const wchar_t* username) :
 	PROTO<FacebookProto>(proto_name, username),
-	m_tszDefaultGroup(getTStringA(FACEBOOK_KEY_DEF_GROUP))
+	m_tszDefaultGroup(getWStringA(FACEBOOK_KEY_DEF_GROUP))
 {
 	facy.parent = this;
 
@@ -48,7 +48,7 @@ FacebookProto::FacebookProto(const char* proto_name, const wchar_t* username) :
 		m_locale = locale;
 
 	// Load custom page prefix, if set
-	ptrW pagePrefix(getTStringA(FACEBOOK_KEY_PAGE_PREFIX));
+	ptrW pagePrefix(getWStringA(FACEBOOK_KEY_PAGE_PREFIX));
 	m_pagePrefix = (pagePrefix != NULL) ? _T2A(pagePrefix, CP_UTF8) : TEXT_EMOJI_PAGE;
 
 	if (m_tszDefaultGroup == NULL)
@@ -84,7 +84,7 @@ FacebookProto::FacebookProto(const char* proto_name, const wchar_t* username) :
 	// Create standard network connection
 	wchar_t descr[512];
 	NETLIBUSER nlu = { sizeof(nlu) };
-	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;
+	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;
 	nlu.szSettingsModule = m_szModuleName;
 	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);
 	nlu.ptszDescriptiveName = descr;
@@ -380,7 +380,7 @@ int FacebookProto::GetInfo(MCONTACT hContact, int)
 
 INT_PTR FacebookProto::GetMyAwayMsg(WPARAM, LPARAM lParam)
 {
-	ptrW statusMsg(getTStringA("StatusMsg"));
+	ptrW statusMsg(getWStringA("StatusMsg"));
 	if (statusMsg == NULL || statusMsg[0] == '\0')
 		return 0;
 
@@ -501,7 +501,7 @@ int FacebookProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.hInstance = g_hInstance;
 	odp.pwszTitle = m_tszUserName;
 	odp.dwInitParam = LPARAM(this);
-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
 
 	odp.position = 271828;
 	odp.pwszGroup = LPGENW("Network");
@@ -564,7 +564,7 @@ INT_PTR FacebookProto::OnMind(WPARAM wParam, LPARAM)
 		wall->title = wcsdup(TranslateT("Own wall"));
 	}
 	else
-		wall->title = getTStringA(hContact, FACEBOOK_KEY_NICK);
+		wall->title = getWStringA(hContact, FACEBOOK_KEY_NICK);
 
 	post_status_data *data = new post_status_data(this, wall);
 
@@ -782,9 +782,9 @@ INT_PTR FacebookProto::CancelFriendship(WPARAM wParam, LPARAM lParam)
 	if (isChatRoom(hContact) || (deleting && getByte(hContact, FACEBOOK_KEY_CONTACT_TYPE) != CONTACT_FRIEND))
 		return 0;
 
-	ptrW tname(getTStringA(hContact, FACEBOOK_KEY_NICK));
+	ptrW tname(getWStringA(hContact, FACEBOOK_KEY_NICK));
 	if (tname == NULL)
-		tname = getTStringA(hContact, FACEBOOK_KEY_ID);
+		tname = getWStringA(hContact, FACEBOOK_KEY_ID);
 
 	if (tname == NULL)
 		return 1;
@@ -926,7 +926,7 @@ void FacebookProto::OpenUrl(std::string url)
 	ptrW data(mir_utf8decodeW(url.c_str()));
 
 	// Check if there is user defined browser for opening links
-	ptrW browser(getTStringA(FACEBOOK_KEY_OPEN_URL_BROWSER));
+	ptrW browser(getWStringA(FACEBOOK_KEY_OPEN_URL_BROWSER));
 	if (browser != NULL)
 		// If so, use it to open this link
 		ForkThread(&FacebookProto::OpenUrlThread, new open_url(browser, data));
@@ -1011,7 +1011,7 @@ void FacebookProto::InitPopups()
 	// Client
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Client errors"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Client");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("facebook"));
 	ppc.colorBack = RGB(191, 0, 0); // red
@@ -1022,7 +1022,7 @@ void FacebookProto::InitPopups()
 	// Newsfeeds
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Wall posts"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Newsfeed");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("newsfeed"));
 	ppc.colorBack = RGB(255, 255, 255); // white
@@ -1033,7 +1033,7 @@ void FacebookProto::InitPopups()
 	// Notifications
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Notifications"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("notification"));
 	ppc.colorBack = RGB(59, 89, 152); // Facebook's blue
@@ -1044,7 +1044,7 @@ void FacebookProto::InitPopups()
 	// Others
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Other events"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Other");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("facebook"));
 	ppc.colorBack = RGB(255, 255, 255); // white
@@ -1055,7 +1055,7 @@ void FacebookProto::InitPopups()
 	// Friendship changes
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Friendship events"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Friendship");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("friendship"));
 	ppc.colorBack = RGB(47, 71, 122); // Facebook's darker blue
@@ -1066,7 +1066,7 @@ void FacebookProto::InitPopups()
 	// Ticker
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Real-time friends activity"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Ticker");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("newsfeed"));
 	ppc.colorBack = RGB(255, 255, 255); // white
@@ -1077,7 +1077,7 @@ void FacebookProto::InitPopups()
 	// On this day (memories)
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Memories"));
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Memories");
-	ppc.ptszDescription = desc;
+	ppc.pwszDescription = desc;
 	ppc.pszName = name;
 	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("memories"));
 	ppc.colorBack = RGB(255, 255, 255); // white
@@ -1098,19 +1098,19 @@ void FacebookProto::InitHotkeys()
 	HOTKEYDESC hkd = { sizeof(hkd) };
 	hkd.pszName = text;
 	hkd.pszService = text;
-	hkd.ptszSection = m_tszUserName;
-	hkd.dwFlags = HKD_TCHAR;
+	hkd.pwszSection = m_tszUserName;
+	hkd.dwFlags = HKD_UNICODE;
 
 	mir_strcpy(tDest, "/VisitProfile");
-	hkd.ptszDescription = LPGENW("Visit profile");
+	hkd.pwszDescription = LPGENW("Visit profile");
 	Hotkey_Register(&hkd);
 
 	mir_strcpy(tDest, "/VisitNotifications");
-	hkd.ptszDescription = LPGENW("Visit notifications");
+	hkd.pwszDescription = LPGENW("Visit notifications");
 	Hotkey_Register(&hkd);
 
 	mir_strcpy(tDest, "/Mind");
-	hkd.ptszDescription = LPGENW("Show 'Share status' window");
+	hkd.pwszDescription = LPGENW("Show 'Share status' window");
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_ALT | HOTKEYF_EXT, 'F');
 	Hotkey_Register(&hkd);
 }
@@ -1120,12 +1120,12 @@ void FacebookProto::InitHotkeys()
  */
 void FacebookProto::InitSounds()
 {
-	SkinAddNewSoundExT("Notification", m_tszUserName, LPGENW("Notification"));
-	SkinAddNewSoundExT("NewsFeed", m_tszUserName, LPGENW("Newsfeed event"));
-	SkinAddNewSoundExT("OtherEvent", m_tszUserName, LPGENW("Other event"));
-	SkinAddNewSoundExT("Friendship", m_tszUserName, LPGENW("Friendship event"));
-	SkinAddNewSoundExT("Ticker", m_tszUserName, LPGENW("Ticker event"));
-	SkinAddNewSoundExT("Memories", m_tszUserName, LPGENW("Memories"));
+	SkinAddNewSoundExW("Notification", m_tszUserName, LPGENW("Notification"));
+	SkinAddNewSoundExW("NewsFeed", m_tszUserName, LPGENW("Newsfeed event"));
+	SkinAddNewSoundExW("OtherEvent", m_tszUserName, LPGENW("Other event"));
+	SkinAddNewSoundExW("Friendship", m_tszUserName, LPGENW("Friendship event"));
+	SkinAddNewSoundExW("Ticker", m_tszUserName, LPGENW("Ticker event"));
+	SkinAddNewSoundExW("Memories", m_tszUserName, LPGENW("Memories"));
 }
 
 /**
@@ -1151,7 +1151,7 @@ void FacebookProto::MessageRead(MCONTACT hContact)
 
 	if (isChatRoom(hContact)) {
 		// Load readers names
-		ptrW treaders(getTStringA(hContact, FACEBOOK_KEY_MESSAGE_READERS));
+		ptrW treaders(getWStringA(hContact, FACEBOOK_KEY_MESSAGE_READERS));
 		mir_snwprintf(st.tszText, TranslateT("Message read: %s by %s"), ttime, treaders ? treaders : L"???");
 		CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, (LPARAM)&st);
 	} else if (!ServiceExists(MS_MESSAGESTATE_UPDATE)){