From 301a0597925ba74ee1d8f1dc77a48f5b659fbbee Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 10 Feb 2013 22:08:39 +0000 Subject: STATIC_PLUGIN : 0x0002 flag added to PLUGININFOEX.flags to mark plugins loaded by the core git-svn-id: http://svn.miranda-ng.org/main/trunk@3547 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/plugins/pluginopts.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/modules/plugins') diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index 093f0bad0d..e8c946b510 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -59,11 +59,9 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA* fd, TCHAR* path, WPARAM, LPARAM l if (checkAPI(buf, &pi, MIRANDA_VERSION_CORE, CHECKAPI_NONE) == 0) return TRUE; - int isdb = hasMuuid(pi, miid_database); - PluginListItemData* dat = (PluginListItemData*)mir_alloc(sizeof(PluginListItemData)); dat->hInst = hInst; - dat->flags = 0; + dat->flags = pi.pluginInfo->flags; CharLower(fd->cFileName); _tcsncpy(dat->fileName, fd->cFileName, SIZEOF(dat->fileName)); @@ -72,13 +70,12 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA* fd, TCHAR* path, WPARAM, LPARAM l LVITEM it = { 0 }; it.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - it.iImage = (pi.pluginInfo->flags & 1) ? 0 : 1; + it.iImage = (dat->flags & UNICODE_AWARE) ? 0 : 1; it.lParam = (LPARAM)dat; int iRow = ListView_InsertItem(hwndList, &it); - bool bNoCheckbox = isdb || !_tcscmp(dat->fileName, _T("advaimg.dll")) || !_tcscmp(dat->fileName, _T("dbchecker.dll")); - if (bNoCheckbox) - dat->flags |= IS_STATIC; + bool bNoCheckbox = (dat->flags & STATIC_PLUGIN) != 0; + //hasMuuid(pi, miid_database) || !_tcscmp(dat->fileName, _T("advaimg.dll")) || !_tcscmp(dat->fileName, _T("dbchecker.dll")); if (isPluginOnWhiteList(fd->cFileName)) ListView_SetItemState(hwndList, iRow, bNoCheckbox ? 0x3000 : 0x2000, LVIS_STATEIMAGEMASK); @@ -88,7 +85,7 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA* fd, TCHAR* path, WPARAM, LPARAM l it.iItem = iRow; it.iSubItem = 1; it.iImage = (hInst != NULL) ? 2 : 3; - if (isdb || hasMuuid(pi, miid_clist) || hasMuuid(pi, miid_protocol)) + if (bNoCheckbox|| hasMuuid(pi, miid_clist) || hasMuuid(pi, miid_protocol)) it.iImage += 2; ListView_SetItem(hwndList, &it); -- cgit v1.2.3