From f3151f33e282214080abacf04521296acec5e9de Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 7 Dec 2015 16:15:24 +0000
Subject: fix to apply the unique identifiers to all menu roots

git-svn-id: http://svn.miranda-ng.org/main/trunk@15826 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Watrack/i_gui.inc        | 14 ++++++++------
 plugins/Watrack/proto/proto.pas  | 14 ++++++++------
 plugins/Watrack/stat/statlog.pas | 15 ++++++++-------
 3 files changed, 24 insertions(+), 19 deletions(-)

(limited to 'plugins/Watrack')

diff --git a/plugins/Watrack/i_gui.inc b/plugins/Watrack/i_gui.inc
index c5fb65b270..c00deaae3b 100644
--- a/plugins/Watrack/i_gui.inc
+++ b/plugins/Watrack/i_gui.inc
@@ -30,13 +30,15 @@ var
   mi:TMO_MenuItem;
 begin
   FillChar(mi, sizeof(mi), 0);
+  mi.root := Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0);
+  Menu_ConfigureItem(mi.root, MCI_OPT_UID, 'CAEA4B95-A873-429F-A083-BB2DF51E2E45');
+
   SET_UID(@mi, '85F2D289-04D2-4C7F-A223-A629CED253F0');
-  mi.root      :=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0);
-  mi.hIcon     :=IcoLib_GetIcon(IcoBtnEnable,0);
-  mi.szName.a  :='Disable WATrack';
-  mi.pszService:=MS_WAT_PLUGINSTATUS;
-  mi.position  :=MenuDisablePos;
-  hMenuDisable:=Menu_AddMainMenuItem(@mi);
+  mi.hIcon     := IcoLib_GetIcon(IcoBtnEnable,0);
+  mi.szName.a  := 'Disable WATrack';
+  mi.pszService:= MS_WAT_PLUGINSTATUS;
+  mi.position  := MenuDisablePos;
+  hMenuDisable := Menu_AddMainMenuItem(@mi);
 end;
 
 procedure ChangeMenuIcons(f1:cardinal);
diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index 568302575f..bcb997a081 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -354,13 +354,15 @@ begin
   RegisterIcons;
 
   FillChar(mi, sizeof(mi), 0);
+  mi.root := Menu_CreateRoot(MO_CONTACT, 'Watrack', 0, 0, 0);
+  Menu_ConfigureItem(mi.root, MCI_OPT_UID, 'CAEA4B95-A873-429F-A083-BB2DF51E2E45');
+
   SET_UID(@mi, '47D372B2-AA27-42B3-A3CB-85D3CE5F6A95');
-  mi.root         :=Menu_CreateRoot(MO_CONTACT, 'Watrack', 0, 0, 0);
-  mi.flags        :=CMIF_NOTOFFLINE or CMIF_NOTOFFLIST;
-  mi.hIcon        :=IcoLib_GetIcon(IcoBtnContext,0);
-  mi.szName.a     :='Get user''s Music Info';
-  mi.pszService   :=MS_WAT_GETCONTACTINFO;
-  hContactMenuItem:=Menu_AddContactMenuItem(@mi);
+  mi.flags         := CMIF_NOTOFFLINE or CMIF_NOTOFFLIST;
+  mi.hIcon         := IcoLib_GetIcon(IcoBtnContext,0);
+  mi.szName.a      := 'Get user''s Music Info';
+  mi.pszService    := MS_WAT_GETCONTACTINFO;
+  hContactMenuItem := Menu_AddContactMenuItem(@mi);
 
   SetProtocol;
   RegisterContacts;
diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas
index 7fee4c5ef9..7ae6f96cb7 100644
--- a/plugins/Watrack/stat/statlog.pas
+++ b/plugins/Watrack/stat/statlog.pas
@@ -583,13 +583,14 @@ begin
 
   FillChar(mi, sizeof(mi), 0);
   SET_UID(@mi, '40F4D15E-7D15-4E7B-A624-2F794586D960');
-  mi.root      :=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuReportPos, 0, 0);
-  mi.hIcon     :=IcoLib_GetIcon(IcoBtnReport,0);
-  mi.szName.a  :='Create WATrack report';
-  mi.pszService:=MS_WAT_MAKEREPORT;
-  mi.position  :=MenuReportPos;
-  hMenuReport:=Menu_AddMainMenuItem(@mi);
-  plStatusHook:=HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);
+  mi.root       := Menu_CreateRoot(MO_MAIN, 'Watrack', MenuReportPos, 0, 0);
+  mi.hIcon      := IcoLib_GetIcon(IcoBtnReport,0);
+  mi.szName.a   := 'Create WATrack report';
+  mi.pszService := MS_WAT_MAKEREPORT;
+  mi.position   := MenuReportPos;
+  hMenuReport   := Menu_AddMainMenuItem(@mi);
+
+  plStatusHook := HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);
 end;
 
 procedure DeInitProc(aSetDisable:boolean);
-- 
cgit v1.2.3