From 37e1f0cb88e2344c288064b7d88963ba7ea26955 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Jun 2012 17:17:39 +0000 Subject: - clists' menus compatibility issues; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@412 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/CLUIFrames/framesmenu.cpp | 35 +++++++++------------------ 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'plugins/Clist_nicer/CLUIFrames/framesmenu.cpp') diff --git a/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp index 1d5b0dd850..07b6ebc4e6 100644 --- a/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp @@ -44,34 +44,23 @@ INT_PTR FreeOwnerDataFrameMenu (WPARAM wParam,LPARAM lParam) static INT_PTR AddContextFrameMenuItem(WPARAM wParam,LPARAM lParam) { - CLISTMENUITEM *mi=(CLISTMENUITEM*)lParam; TMO_MenuItem tmi; + CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam; + if ( !pcli->pfnConvertMenu(mi, &tmi)) + return NULL; - if(mi->cbSize!=sizeof(CLISTMENUITEM)) return 0; - - memset(&tmi,0,sizeof(tmi)); + tmi.root = (mi->flags & CMIF_ROOTHANDLE) ? mi->hParentMenu : NULL; - tmi.cbSize=sizeof(tmi); - tmi.flags=mi->flags; - tmi.hIcon=mi->hIcon; - tmi.hotKey=mi->hotKey; - tmi.position=mi->position; - tmi.pszName=mi->pszName; + lpFrameMenuExecParam fmep = (lpFrameMenuExecParam)mir_alloc(sizeof(FrameMenuExecParam)); + if (fmep == NULL) + return 0; - if ( mi->flags & CMIF_ROOTHANDLE ) - tmi.root = mi->hParentMenu; - { - lpFrameMenuExecParam fmep; - fmep=(lpFrameMenuExecParam)mir_alloc(sizeof(FrameMenuExecParam)); - if (fmep==NULL){return(0);}; - fmep->szServiceName=mir_strdup(mi->pszService); - fmep->Frameid=mi->popupPosition; - fmep->param1=(INT_PTR)mi->pszContactOwner; - - tmi.ownerdata=fmep; - } + fmep->szServiceName = mir_strdup(mi->pszService); + fmep->Frameid = mi->popupPosition; + fmep->param1 = (INT_PTR)mi->pszContactOwner; + tmi.ownerdata = fmep; - return(CallService(MO_ADDNEWMENUITEM,(WPARAM)hFrameMenuObject,(LPARAM)&tmi)); + return CallService(MO_ADDNEWMENUITEM,(WPARAM)hFrameMenuObject,(LPARAM)&tmi); } static INT_PTR RemoveContextFrameMenuItem(WPARAM wParam,LPARAM lParam) -- cgit v1.2.3