SKINICONDESC -> MAllStrings

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

9 files changed, 35 insertions, 36 deletions

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index e2a0ca4787..0315bd3c01 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -890,16 +890,16 @@ void InitXStatusIcons()
 {

 	TCHAR lib[2*MAX_PATH] = {0};

 

-	SKINICONDESC sid = { sizeof(sid) };

-	sid.pszSection = "Protocols/" ICQ_PROTOCOL_NAME "/"LPGEN("Custom Status");

+	SKINICONDESC sid = { 0 };

+	sid.section.a = "Protocols/" ICQ_PROTOCOL_NAME "/"LPGEN("Custom Status");

 	sid.flags = SIDF_PATH_TCHAR;

-	sid.ptszDefaultFile = InitXStatusIconLibrary(lib, SIZEOF(lib));

+	sid.defaultFile.t = InitXStatusIconLibrary(lib, SIZEOF(lib));

 

 	for (int i = 0; i < XSTATUS_COUNT; i++) {

 		char szTemp[100];

 		mir_snprintf(szTemp, "icq_xstatus%d", i);

 		sid.pszName = szTemp;

-		sid.pszDescription = (LPSTR)nameXStatus[i];

+		sid.description.a = (LPSTR)nameXStatus[i];

 		sid.iDefaultIndex = -(IDI_XSTATUS1+i);

 		hXStatusIcons[i] = Skin_AddIcon(&sid);

 	}

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 0b582f3548..6ce5f2385c 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -119,11 +119,11 @@ void CIconPool::RegisterIcon(const char *name, TCHAR *filename, int iconid, TCHA
 	item->m_name = mir_strdup(name);

 	item->m_szIcolibName = mir_strdup(szSettingName);

 

-	SKINICONDESC sid = { sizeof(sid) };

-	sid.ptszDefaultFile = filename;

+	SKINICONDESC sid = { 0 };

+	sid.defaultFile.t = filename;

 	sid.pszName = szSettingName;

-	sid.ptszSection = szSection;

-	sid.ptszDescription = szDescription;

+	sid.section.t = szSection;

+	sid.description.t = szDescription;

 	sid.flags = SIDF_ALL_TCHAR;

 	sid.iDefaultIndex = iconid;

 	item->m_hIcolibItem = Skin_AddIcon(&sid);

@@ -284,12 +284,12 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa
 	if (hi) has_proto_icon=TRUE;

 	if (hi && nf) DestroyIcon(hi);

 	if (IconName != NULL && SectName != NULL)  {

-		SKINICONDESC sid = { sizeof(sid) };

+		SKINICONDESC sid = { 0 };

 		sid.hDefaultIcon = (has_proto_icon) ? NULL : LoadSkinnedProtoIcon(0, -internalidx);

-		sid.ptszSection = SectName;

+		sid.section.t = SectName;

 		sid.pszName = IconName;

-		sid.ptszDescription = Description;

-		sid.pszDefaultFile = szMyPath;

+		sid.description.t = Description;

+		sid.defaultFile.a = szMyPath;

 		sid.iDefaultIndex = i;

 		sid.flags = SIDF_TCHAR;

 		Skin_AddIcon(&sid);

diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index a0d0261ec1..0bfe17d19b 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -100,9 +100,9 @@ void InitXStatusIcons()
 

 	GetModuleFileName((g_hDLLXStatusIcons != NULL) ? g_hDLLXStatusIcons : g_hInstance, szBuff, SIZEOF(szBuff));

 

-	SKINICONDESC sid = { sizeof(sid) };

-	sid.ptszSection = LPGENT("Protocols")_T("/")LPGENT("MRA")_T("/")LPGENT("Custom Status");

-	sid.ptszDefaultFile = szBuff;

+	SKINICONDESC sid = { 0 };

+	sid.section.t = LPGENT("Protocols")_T("/")LPGENT("MRA")_T("/")LPGENT("Custom Status");

+	sid.defaultFile.t = szBuff;

 	sid.cx = sid.cy = 16;

 	sid.flags = SIDF_ALL_TCHAR;

 

@@ -113,7 +113,7 @@ void InitXStatusIcons()
 		sid.pszName = szBuff;

 

 		int iCurIndex = i+IDI_XSTATUS1-1;

-		sid.ptszDescription = (TCHAR*)lpcszXStatusNameDef[i];

+		sid.description.t = (TCHAR*)lpcszXStatusNameDef[i];

 		sid.iDefaultIndex = -iCurIndex;

 

 		hXStatusAdvancedStatusIcons[i] = Skin_AddIcon(&sid);

diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp
index 2b2d5dccc9..6137f6bda3 100644
--- a/protocols/MSN/src/msn_skypeab.cpp
+++ b/protocols/MSN/src/msn_skypeab.cpp
@@ -124,7 +124,7 @@ bool CMsnProto::MSN_SKYABGetProfiles(const char *pszPOST)
 	if (!APISkypeComRequest(&nlhr, headers)) return false;

 	nlhr.requestType = REQUEST_POST;

 	nlhr.szUrl = "https://api.skype.com/users/self/contacts/profiles";

-	nlhr.dataLength = mir_strlen(pszPOST);

+	nlhr.dataLength = (int)mir_strlen(pszPOST);

 	nlhr.pData = (char*)pszPOST;

 

 	mHttpsTS = clock();

@@ -343,7 +343,7 @@ bool CMsnProto::MSN_SKYABAuthRq(const char *wlid, const char *pszGreeting)
 	nlhr.headers[3].szValue = "application/x-www-form-urlencoded";

 	nlhr.headersCount++;

 	post.Format("greeting=%s", pszGreeting);

-	nlhr.dataLength = mir_strlen(post);

+	nlhr.dataLength = (int)mir_strlen(post);

 	nlhr.pData = (char*)(const char*)post;

 

 	mHttpsTS = clock();

diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index a846ef0390..7c49c9adad 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -37,18 +37,18 @@ void CSkypeProto::InitIcons()
 	char szSettingName[100];

 	TCHAR szSectionName[100];

 

-	SKINICONDESC sid = { sizeof(SKINICONDESC) };

+	SKINICONDESC sid = { 0 };

 	sid.flags = SIDF_ALL_TCHAR;

-	sid.ptszDefaultFile = szFile;

+	sid.defaultFile.t = szFile;

 	sid.pszName = szSettingName;

-	sid.ptszSection = szSectionName;

+	sid.section.t = szSectionName;

 

 	mir_sntprintf(szSectionName, SIZEOF(szSectionName), _T("%s/%s"), LPGENT("Protocols"), LPGENT(MODULE));

 	for (int i = 0; i < SIZEOF(Icons); i++)

 	{

 		mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", MODULE, Icons[i].Name);

 

-		sid.ptszDescription = Icons[i].Description;

+		sid.description.t = Icons[i].Description;

 		sid.iDefaultIndex = -Icons[i].IconId;

 		Icons[i].Handle = Skin_AddIcon(&sid);

 	}

diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 1ce64f65de..8841ce81ef 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -24,18 +24,17 @@ CSteamProto::CSteamProto(const char* protoName, const TCHAR* userName) :
 	char settingName[100];
 	mir_snprintf(settingName, SIZEOF(settingName), "%s_%s", MODULE, "main");
 
-	SKINICONDESC sid = {0};
-	sid.cbSize = sizeof(SKINICONDESC);
+	SKINICONDESC sid = { 0 };
 	sid.flags = SIDF_ALL_TCHAR;
-	sid.ptszDefaultFile = filePath;
+	sid.defaultFile.t = filePath;
 	sid.pszName = settingName;
-	sid.ptszSection = sectionName;
-	sid.ptszDescription = LPGENT("Protocol icon");
+	sid.section.t = sectionName;
+	sid.description.t = LPGENT("Protocol icon");
 	sid.iDefaultIndex = -IDI_STEAM;
 	Skin_AddIcon(&sid);
 
 	mir_snprintf(settingName, SIZEOF(settingName), "%s_%s", MODULE, "gaming");
-	sid.ptszDescription = LPGENT("Gaming icon");
+	sid.description.t = LPGENT("Gaming icon");
 	sid.iDefaultIndex = -IDI_GAMING;
 	Skin_AddIcon(&sid);
 
diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp
index eecb2e2bd6..10a228c626 100644
--- a/protocols/Tox/src/tox_icons.cpp
+++ b/protocols/Tox/src/tox_icons.cpp
@@ -17,18 +17,18 @@ void CToxProto::InitIcons()
 	char szSettingName[100];

 	TCHAR szSectionName[100];

 

-	SKINICONDESC sid = { sizeof(SKINICONDESC) };

+	SKINICONDESC sid = { 0 };

 	sid.flags = SIDF_ALL_TCHAR;

-	sid.ptszDefaultFile = szFile;

+	sid.defaultFile.t = szFile;

 	sid.pszName = szSettingName;

-	sid.ptszSection = szSectionName;

+	sid.section.t = szSectionName;

 

 	mir_sntprintf(szSectionName, SIZEOF(szSectionName), _T("%s/%s"), LPGENT("Protocols"), LPGENT(MODULE));

 	for (int i = 0; i < SIZEOF(Icons); i++)

 	{

 		mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", MODULE, Icons[i].Name);

 

-		sid.ptszDescription = Icons[i].Description;

+		sid.description.t = Icons[i].Description;

 		sid.iDefaultIndex = -Icons[i].IconId;

 		Icons[i].Handle = Skin_AddIcon(&sid);

 	}

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index 780bd12159..4823119505 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -12,8 +12,8 @@ struct SearchParam
 	LONG id;

 };

 

-WhatsAppProto::WhatsAppProto(const char* proto_name, const TCHAR* username) :

-	PROTO<WhatsAppProto>(proto_name, username),

+WhatsAppProto::WhatsAppProto(const char *proto_name, const TCHAR *username)

+	: PROTO<WhatsAppProto>(proto_name, username),

 	m_tszDefaultGroup(getTStringA(WHATSAPP_KEY_DEF_GROUP))

 {

 	update_loop_lock_ = CreateEvent(NULL, false, false, NULL);

@@ -322,7 +322,7 @@ int WhatsAppProto::OnUserInfo(WPARAM, LPARAM hContact)
 	ptrA jid(getStringA(hContact, WHATSAPP_KEY_ID));

 	if (jid && isOnline())

 		m_pConnection->sendQueryLastOnline((char*)jid);

-	

+

 	return 0;

 }

 

diff --git a/protocols/Yahoo/src/version.h b/protocols/Yahoo/src/version.h
index 8767e4ee00..e6c4a66171 100644
--- a/protocols/Yahoo/src/version.h
+++ b/protocols/Yahoo/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          11

 #define __RELEASE_NUM            0

-#define __BUILD_NUM              1

+#define __BUILD_NUM              2

 

 #include <stdver.h>