forgotten LPGENW restored

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

12 files changed, 27 insertions, 27 deletions

diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp
index cc9eded91c..8189395ca0 100644
--- a/protocols/AimOscar/src/chat.cpp
+++ b/protocols/AimOscar/src/chat.cpp
@@ -39,8 +39,8 @@ void CAimProto::chat_start(const char *id, unsigned short exchange)
 	wchar_t *idt = mir_a2u(id);

 	Chat_NewSession(GCW_CHATROOM, m_szModuleName, idt, idt);

 

-	Chat_AddGroup(m_szModuleName, idt, L"Me");

-	Chat_AddGroup(m_szModuleName, idt, L"Others");

+	Chat_AddGroup(m_szModuleName, idt, LPGENW("Me"));

+	Chat_AddGroup(m_szModuleName, idt, LPGENW("Others"));

 

 	Chat_Control(m_szModuleName, idt, SESSION_INITDONE);

 	Chat_Control(m_szModuleName, idt, SESSION_ONLINE);

diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp
index cc2a5b1f1a..e7e85a10f8 100644
--- a/protocols/FacebookRM/src/chat.cpp
+++ b/protocols/FacebookRM/src/chat.cpp
@@ -248,10 +248,10 @@ void FacebookProto::AddChat(const char *id, const wchar_t *tname)
 	Chat_NewSession(GCW_PRIVMESS, m_szModuleName, tid, tname);
 
 	// Send setting events
-	Chat_AddGroup(m_szModuleName, tid, L"Myself");
-	Chat_AddGroup(m_szModuleName, tid, L"Friend");
-	Chat_AddGroup(m_szModuleName, tid, L"User");
-	Chat_AddGroup(m_szModuleName, tid, L"Former");
+	Chat_AddGroup(m_szModuleName, tid, LPGENW("Myself"));
+	Chat_AddGroup(m_szModuleName, tid, LPGENW("Friend"));
+	Chat_AddGroup(m_szModuleName, tid, LPGENW("User"));
+	Chat_AddGroup(m_szModuleName, tid, LPGENW("Former"));
 
 	// Finish initialization
 	bool hideChats = getBool(FACEBOOK_KEY_HIDE_CHATS, DEFAULT_HIDE_CHATS);
diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index 9e46875b0a..3ca980c332 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -314,7 +314,7 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou
 	Chat_SetStatusbarText(m_szModuleName, chat->id, status);

 

 	// Add normal group

-	Chat_AddGroup(m_szModuleName, chat->id, L"Participants");

+	Chat_AddGroup(m_szModuleName, chat->id, LPGENW("Participants"));

 

 	GCDEST gcd = { m_szModuleName, chat->id, GC_EVENT_JOIN };

 	GCEVENT gce = { &gcd };

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index f47067ee3d..91e3f2fc9f 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -1270,12 +1270,12 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 				PostIrcMessage(L"/MODE %s", sChanName);

 

 				// register the statuses

-				Chat_AddGroup(m_szModuleName, sID, L"Owner");

-				Chat_AddGroup(m_szModuleName, sID, L"Admin");

-				Chat_AddGroup(m_szModuleName, sID, L"Op");

-				Chat_AddGroup(m_szModuleName, sID, L"Halfop");

-				Chat_AddGroup(m_szModuleName, sID, L"Voice");

-				Chat_AddGroup(m_szModuleName, sID, L"Normal");

+				Chat_AddGroup(m_szModuleName, sID, LPGENW("Owner"));

+				Chat_AddGroup(m_szModuleName, sID, LPGENW("Admin"));

+				Chat_AddGroup(m_szModuleName, sID, LPGENW("Op"));

+				Chat_AddGroup(m_szModuleName, sID, LPGENW("Halfop"));

+				Chat_AddGroup(m_szModuleName, sID, LPGENW("Voice"));

+				Chat_AddGroup(m_szModuleName, sID, LPGENW("Normal"));

 				{

 					int k = 0;

 					CMStringW sTemp = GetWord(sNamesList, k);

@@ -2323,7 +2323,7 @@ bool CIrcProto::DoOnConnect(const CIrcMessage*)
 		}

 	}

 

-	Chat_AddGroup(m_szModuleName, SERVERWINDOW, L"Normal");

+	Chat_AddGroup(m_szModuleName, SERVERWINDOW, LPGENW("Normal"));

 	Chat_Control(m_szModuleName, SERVERWINDOW, SESSION_ONLINE);

 

 	CallFunctionAsync(sttMainThrdOnConnect, this);

diff --git a/protocols/MRA/src/MraChat.cpp b/protocols/MRA/src/MraChat.cpp
index 8cdb5ac9fa..dd01c23764 100644
--- a/protocols/MRA/src/MraChat.cpp
+++ b/protocols/MRA/src/MraChat.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "proto.h"

 

-static LPWSTR lpwszStatuses[] = { L"Owners", L"Inviter", L"Visitors" };

+static LPWSTR lpwszStatuses[] = { LPGENW("Owners"), LPGENW("Inviter"), LPGENW("Visitors") };

 #define MRA_CHAT_STATUS_OWNER	0

 #define MRA_CHAT_STATUS_INVITER	1

 #define MRA_CHAT_STATUS_VISITOR	2

diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index 6c1a63978f..775cf2e150 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_history.h>

 

 static const wchar_t *m_ptszRoles[] = {

-	L"admin",

-	L"user"

+	LPGENW("Admin"),

+	LPGENW("User")

 };

 

 MCONTACT CMsnProto::MSN_GetChatInernalHandle(MCONTACT hContact)

diff --git a/protocols/MinecraftDynmap/src/chat.cpp b/protocols/MinecraftDynmap/src/chat.cpp
index 2990d65933..5667d5c2d5 100644
--- a/protocols/MinecraftDynmap/src/chat.cpp
+++ b/protocols/MinecraftDynmap/src/chat.cpp
@@ -132,8 +132,8 @@ INT_PTR MinecraftDynmapProto::OnJoinChat(WPARAM,LPARAM suppress)
 		return 0;
 
 	// Create a group
-	Chat_AddGroup(m_szModuleName, m_tszUserName, L"Admin");
-	Chat_AddGroup(m_szModuleName, m_tszUserName, L"Normal");
+	Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Admin"));
+	Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Normal"));
 		
 	// Note: Initialization will finish up in SetChatStatus, called separately
 	if (!suppress)
diff --git a/protocols/Omegle/src/chat.cpp b/protocols/Omegle/src/chat.cpp
index bbfce622b8..8552d7885c 100644
--- a/protocols/Omegle/src/chat.cpp
+++ b/protocols/Omegle/src/chat.cpp
@@ -273,8 +273,8 @@ INT_PTR OmegleProto::OnJoinChat(WPARAM, LPARAM suppress)
 		return 0;

 

 	// Create a group

-	Chat_AddGroup(m_szModuleName, m_tszUserName, L"Admin");

-	Chat_AddGroup(m_szModuleName, m_tszUserName, L"Normal");

+	Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Admin"));

+	Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Normal"));

 

 	SetTopic();

 

diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp
index dfbdfde308..1cd96fd928 100644
--- a/protocols/Sametime/src/conference.cpp
+++ b/protocols/Sametime/src/conference.cpp
@@ -115,7 +115,7 @@ void mwServiceConf_conf_opened(mwConference* conf, GList* members)
 	Chat_NewSession(GCW_CHATROOM, proto->m_szModuleName, tszConfId, tszConfTitle);

 

 	// add a group

-	Chat_AddGroup(proto->m_szModuleName, tszConfId, L"Normal");

+	Chat_AddGroup(proto->m_szModuleName, tszConfId, LPGENW("Normal"));

 

 	// add users

 	GCDEST gcd = { proto->m_szModuleName, tszConfId, GC_EVENT_JOIN };

diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index b8c63ee339..f18e6f6148 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -62,8 +62,8 @@ void CSkypeProto::StartChatRoom(const wchar_t *tid, const wchar_t *tname)
 	Chat_NewSession(GCW_CHATROOM, m_szModuleName, tid, tname);

 

 	// Create a user statuses

-	Chat_AddGroup(m_szModuleName, tid, L"Admin");

-	Chat_AddGroup(m_szModuleName, tid, L"User");

+	Chat_AddGroup(m_szModuleName, tid, LPGENW("Admin"));

+	Chat_AddGroup(m_szModuleName, tid, LPGENW("User"));

 

 	// Finish initialization

 	Chat_Control(m_szModuleName, tid, (getBool("HideChats", 1) ? WINDOW_HIDDEN : SESSION_INITDONE));

diff --git a/protocols/Twitter/src/chat.cpp b/protocols/Twitter/src/chat.cpp
index d351d6d3ab..85b210d86b 100644
--- a/protocols/Twitter/src/chat.cpp
+++ b/protocols/Twitter/src/chat.cpp
@@ -123,7 +123,7 @@ INT_PTR TwitterProto::OnJoinChat(WPARAM, LPARAM suppress)
 		return 0;

 

 	// ***** Create a group

-	Chat_AddGroup(m_szModuleName, m_tszUserName, L"Normal");

+	Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Normal"));

 

 	// ***** Hook events

 	HookProtoEvent(ME_GC_EVENT, &TwitterProto::OnChatOutgoing);

diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp
index 4fc7eb8e95..6a70f89e42 100644
--- a/protocols/Yahoo/src/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
@@ -153,8 +153,8 @@ void CYahooProto::ChatStart(const char* room)
 	ptrW idt(mir_a2u(room));

 	Chat_NewSession(GCW_CHATROOM, m_szModuleName, idt, idt);

 

-	Chat_AddGroup(m_szModuleName, idt, L"Me");

-	Chat_AddGroup(m_szModuleName, idt, L"Others");

+	Chat_AddGroup(m_szModuleName, idt, LPGENW("Me"));

+	Chat_AddGroup(m_szModuleName, idt, LPGENW("Others"));

 

 	Chat_Control(m_szModuleName, idt, SESSION_INITDONE);

 	Chat_Control(m_szModuleName, idt, SESSION_ONLINE);