- CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu;

- Menu_AddContactMenuItem now receives parameter szProto;
- Menu_Add* helpers are converted into real functions;

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

8 files changed, 13 insertions, 13 deletions

diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp
index 6be4cf1a7e..b3c9f95c44 100644
--- a/src/core/stdaway/src/awaymsg.cpp
+++ b/src/core/stdaway/src/awaymsg.cpp
@@ -170,7 +170,7 @@ int LoadAwayMsgModule(void)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = -2000005000;

 	mi.flags = CMIF_NOTOFFLINE;

-	mi.pszName = LPGEN("Re&ad status message");

+	mi.name.a = LPGEN("Re&ad status message");

 	mi.pszService = MS_AWAYMSG_SHOWAWAYMSG;

 	hAwayMsgMenuItem = Menu_AddContactMenuItem(&mi);

 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, AwayMsgPreBuildMenu);

diff --git a/src/core/stdemail/src/email.cpp b/src/core/stdemail/src/email.cpp
index 52b6e64e5d..87c505b6ea 100644
--- a/src/core/stdemail/src/email.cpp
+++ b/src/core/stdemail/src/email.cpp
@@ -69,7 +69,7 @@ int LoadSendRecvEMailModule(void)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = -2000010000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);

-	mi.pszName = LPGEN("&E-mail");

+	mi.name.a = LPGEN("&E-mail");

 	mi.pszService = MS_EMAIL_SENDEMAIL;

 	hEMailMenuItem = Menu_AddContactMenuItem(&mi);

 

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 1a7ad53931..6c0c01c207 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -339,7 +339,7 @@ static int SRFileModulesLoaded(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = -2000020000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

-	mi.pszName = LPGEN("&File");

+	mi.name.a = LPGEN("&File");

 	mi.pszService = MS_FILE_SENDFILE;

 	hSRFileMenuItem = Menu_AddContactMenuItem(&mi);

 

@@ -437,7 +437,7 @@ int LoadSendRecvFileModule(void)
 	CLISTMENUITEM mi = { 0 };

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

 	mi.position = 1900000000;

-	mi.pszName = LPGEN("File &transfers...");

+	mi.name.a = LPGEN("File &transfers...");

 	mi.pszService = "FtMgr/Show"; //MS_PROTO_SHOWFTMGR;

 	Menu_AddMainMenuItem(&mi);

 

diff --git a/src/core/stdhelp/src/help.cpp b/src/core/stdhelp/src/help.cpp
index 95fbab090f..d134d9fc26 100644
--- a/src/core/stdhelp/src/help.cpp
+++ b/src/core/stdhelp/src/help.cpp
@@ -77,25 +77,25 @@ int LoadHelpModule(void)
 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);

 	mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("&Help"), 2000090000);

 	mi.position = 2000090000;

-	mi.pszName = LPGEN("&About...");

+	mi.name.a = LPGEN("&About...");

 	mi.pszService = "Help/AboutCommand";

 	Menu_AddMainMenuItem(&mi);

 

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);

 	mi.position = -500050000;

-	mi.pszName = LPGEN("&Support");

+	mi.name.a = LPGEN("&Support");

 	mi.pszService = "Help/IndexCommand";

 	Menu_AddMainMenuItem(&mi);

 

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDAWEB);

 	mi.position = 2000050000;

-	mi.pszName = LPGEN("&Miranda NG homepage");

+	mi.name.a = LPGEN("&Miranda NG homepage");

 	mi.pszService = "Help/WebsiteCommand";

 	Menu_AddMainMenuItem(&mi);

 

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	mi.position = 2000040000;

-	mi.pszName = LPGEN("&Report bug");

+	mi.name.a = LPGEN("&Report bug");

 	mi.pszService = "Help/BugCommand";

 	Menu_AddMainMenuItem(&mi);

 	return 0;

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 330913a4a5..ba2f82ab62 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -282,7 +282,7 @@ static int SplitmsgModulesLoaded(WPARAM, LPARAM)
 	mi.position = -2000090000;

 	mi.flags = CMIF_DEFAULT;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);

-	mi.pszName = LPGEN("&Message");

+	mi.name.a = LPGEN("&Message");

 	mi.pszService = MS_MSG_SENDMESSAGE;

 	hMsgMenuItem = Menu_AddContactMenuItem(&mi);

 

diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index 8ea9ae4aa2..94de89639c 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -404,7 +404,7 @@ int LoadHistoryModule(void)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = 1000090000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

-	mi.pszName = LPGEN("View &history");

+	mi.name.a = LPGEN("View &history");

 	mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;

 	hContactMenu = Menu_AddContactMenuItem(&mi);

 

diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index ad3476c23a..e6bbf11e77 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -122,7 +122,7 @@ static int SRUrlModulesLoaded(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = -2000040000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

-	mi.pszName = LPGEN("Web page address (&URL)");

+	mi.name.a = LPGEN("Web page address (&URL)");

 	mi.pszService = MS_URL_SENDURL;

 	hSRUrlMenuItem = Menu_AddContactMenuItem(&mi);

 

diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index ed003d3954..93511c627f 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -631,12 +631,12 @@ int LoadUserInfoModule(void)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = 1000050000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

-	mi.pszName = LPGEN("User &details");

+	mi.name.a = LPGEN("User &details");

 	mi.pszService = MS_USERINFO_SHOWDIALOG;

 	Menu_AddContactMenuItem(&mi);

 

 	mi.position = 500050000;

-	mi.pszName = LPGEN("View/change my &details...");

+	mi.name.a = LPGEN("View/change my &details...");

 	Menu_AddMainMenuItem(&mi);

 

 	hWindowList = WindowList_Create();