From 745da18e1d7f576551444122d8b8f7eec0ad3fc9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 15 Dec 2015 19:34:20 +0000
Subject: missing UIDs in MirOTR menu
git-svn-id: http://svn.miranda-ng.org/main/trunk@15869 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/MirOTR/src/mirotrmenu.cpp | 16 ++++++++--------
plugins/MirOTR/src/svcs_menu.cpp | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'plugins/MirOTR/src')
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 93ea2f2696..407f1cbf63 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -10,7 +10,7 @@ typedef struct
{
char *szServiceName;
}
-MirOTRMenuExecParam,*lpMirOTRMenuExecParam;
+MirOTRMenuExecParam, *lpMirOTRMenuExecParam;
////////////////////////////////////////////
// MirOTR MENU
@@ -19,7 +19,7 @@ MirOTRMenuExecParam,*lpMirOTRMenuExecParam;
static HGENMENU AddMirOTRMenuItem(TMO_MenuItem *pmi, const char *pszService)
{
// add owner data
- lpMirOTRMenuExecParam cmep = ( lpMirOTRMenuExecParam )mir_calloc(sizeof(MirOTRMenuExecParam));
+ lpMirOTRMenuExecParam cmep = (lpMirOTRMenuExecParam)mir_calloc(sizeof(MirOTRMenuExecParam));
cmep->szServiceName = mir_strdup(pszService);
return Menu_AddItem(hMirOTRMenuObject, pmi, cmep);
}
@@ -27,12 +27,12 @@ static HGENMENU AddMirOTRMenuItem(TMO_MenuItem *pmi, const char *pszService)
//called with:
//wparam - ownerdata
//lparam - lparam from winproc
-INT_PTR MirOTRMenuExecService(WPARAM wParam,LPARAM lParam)
+INT_PTR MirOTRMenuExecService(WPARAM wParam, LPARAM lParam)
{
- if (wParam!=0) {
- lpMirOTRMenuExecParam cmep=(lpMirOTRMenuExecParam)wParam;
+ if (wParam != 0) {
+ lpMirOTRMenuExecParam cmep = (lpMirOTRMenuExecParam)wParam;
//call with wParam=(MCONTACT)hContact
- CallService(cmep->szServiceName,lParam,0);
+ CallService(cmep->szServiceName, lParam, 0);
}
return 0;
}
@@ -85,7 +85,7 @@ INT_PTR MirOTRMenuCheckService(WPARAM wParam, LPARAM)
Menu_ModifyItem(hStatusInfoItem, TranslateT(LANG_STATUS_DISABLED), IcoLib_GetIconHandle(ICON_NOT_PRIVATE));
}
}
- else if (pcpp->MenuItemHandle == hHTMLConvMenuItem)
+ else if (pcpp->MenuItemHandle == hHTMLConvMenuItem)
Menu_SetChecked(hHTMLConvMenuItem, db_get_b(hContact, MODULENAME, "HTMLConv", 0) != 0);
}
return TRUE;
@@ -209,7 +209,7 @@ void UninitMirOTRMenu(void)
hDummyPaintWin = 0;
UnregisterClass(_T("MirOTRPopupMenuProcessor"), hInst);
-
+
Menu_RemoveObject(hMirOTRMenuObject);
hMirOTRMenuObject = 0;
}
diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp
index bc905375aa..7ba2cc629a 100644
--- a/plugins/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/src/svcs_menu.cpp
@@ -162,16 +162,16 @@ void InitMenu()
mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR;
mi.position = -400000;
+ SET_UID(mi, 0xAB574FAD, 0x15D8, 0x49FF, 0xB7, 0x03, 0xDA, 0x2B, 0x45, 0x46, 0xC3, 0x56);
mi.name.t = _T(LANG_STOP_OTR);
mi.pszService = MS_OTR_MENUSTOP;
mi.hIcolibItem = IcoLib_GetIconHandle(ICON_PRIVATE);
-
hStopItem = Menu_AddContactMenuItem(&mi);
+ mi.uid.d[7]++;
mi.name.t = _T(LANG_START_OTR);
mi.pszService = MS_OTR_MENUSTART;
mi.hIcolibItem = IcoLib_GetIconHandle(ICON_NOT_PRIVATE);
-
hStartItem = Menu_AddContactMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, SVC_PrebuildContactMenu);
--
cgit v1.2.3