some service menus declared as non-tunable

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

2 files changed, 5 insertions, 8 deletions

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index fbd876b1e5..ffbd9ae565 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -665,23 +665,20 @@ int MirandaLoaded(WPARAM, LPARAM)
 		mi.name.t = LPGENT("Autoreply");

 		g_hToggleSOEContactMenuItem = Menu_AddContactMenuItem(&mi);

 

-		mi.flags = CMIF_TCHAR;

+		mi.flags = CMIF_TCHAR | CMIF_SYSTEM;

 		mi.root = g_hToggleSOEContactMenuItem;

 		mi.position = 1000020000;

 

-		SET_UID(mi, 0x1054c863, 0xfb0c, 0x4e90, 0xb9, 0xe5, 0x89, 0x95, 0x25, 0xb3, 0x5b, 0x6d);

 		mi.hIcolibItem = iconList[1].hIcolib;

 		mi.name.t = LPGENT("On");

 		mi.pszService = MS_AWAYSYS_AUTOREPLY_ON;

 		g_hAutoreplyOnContactMenuItem = Menu_AddContactMenuItem(&mi);

 

-		SET_UID(mi, 0xdb66409, 0x8d44, 0x43e7, 0x99, 0xa1, 0x1c, 0x48, 0xab, 0x73, 0x4d, 0xe8);

 		mi.hIcolibItem = iconList[0].hIcolib;

 		mi.name.t = LPGENT("Off");

 		mi.pszService = MS_AWAYSYS_AUTOREPLY_OFF;

 		g_hAutoreplyOffContactMenuItem = Menu_AddContactMenuItem(&mi);

 

-		SET_UID(mi, 0x101471b9, 0x4309, 0x4062, 0xa8, 0x5e, 0xa2, 0xae, 0x14, 0x7e, 0x4a, 0xb3);

 		mi.hIcolibItem = iconList[5].hIcolib;

 		mi.name.t = LPGENT("Use the default setting");

 		mi.pszService = MS_AWAYSYS_AUTOREPLY_USEDEFAULT;

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index bf4567b381..f80c5e833d 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -301,7 +301,7 @@ void g_MenuInit(void)
 	g_hMenuDirectPresence[0] = Menu_AddContactMenuItem(&mi);

 

 	UNSET_UID(mi);

-	mi.flags |= CMIF_TCHAR;

+	mi.flags |= CMIF_TCHAR | CMIF_SYSTEM;

 	mi.root = g_hMenuDirectPresence[0];

 	for (int i = 0; i < _countof(PresenceModeArray); i++) {

 		char buf[] = "Jabber/DirectPresenceX";

@@ -325,16 +325,15 @@ void g_MenuInit(void)
 	mi.hIcolibItem = g_GetIconHandle(IDI_JABBER);

 	g_hMenuResourcesRoot = Menu_AddContactMenuItem(&mi);

 

-	SET_UID(mi, 0xb8059d69, 0xa927, 0x4d68, 0xb4, 0x88, 0xf7, 0x32, 0x85, 0x50, 0xde, 0x6f);

+	mi.flags |= CMIF_SYSTEM; // these menu items aren't tunable

+	mi.root = g_hMenuResourcesRoot;

 	mi.pszService = "Jabber/UseResource_last";

 	mi.name.a = LPGEN("Last Active");

 	mi.position = -1999901000;

-	mi.root = g_hMenuResourcesRoot;

 	mi.hIcolibItem = g_GetIconHandle(IDI_JABBER);

 	g_hMenuResourcesActive = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunctionParam(mi.pszService, JabberMenuHandleResource, MENUITEM_LASTSEEN);

 

-	SET_UID(mi,0xf44812ea, 0x4f37, 0x4a57, 0x86, 0xa8, 0x40, 0x51, 0x22, 0x9f, 0xd5, 0xa8);

 	mi.pszService = "Jabber/UseResource_server";

 	mi.name.a = LPGEN("Server's Choice");

 	mi.position = -1999901000;

@@ -435,6 +434,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 

 	char text[256];

 	CMenuItem mi;

+	mi.flags = CMIF_SYSTEM;

 	mi.pszService = text;

 

 	CMString szTmp;