2 files changed, 8 insertions, 36 deletions
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp
index 55e8022a39..d0747f234b 100644
--- a/plugins/FTPFileYM/src/ftpfile.cpp
+++ b/plugins/FTPFileYM/src/ftpfile.cpp
@@ -216,49 +216,21 @@ int PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 
 	bool bHideRoot = opt.bHideInactive;
 	for (int i = 0; i < ServerList::FTP_COUNT; i++) 
-	{
 		if (ftpList[i]->bEnabled)
 			bHideRoot = false;
-	}
-
-	CLISTMENUITEM mi = { sizeof(mi) };
-	mi.flags = CMIM_FLAGS;
 
 	if (opt.bUseSubmenu)
-	{
-		if (!bIsContact || bHideRoot) mi.flags |= CMIF_HIDDEN;
-		else mi.flags &= ~CMIF_HIDDEN;
-		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenu, (LPARAM)&mi);
-	}
+		Menu_ShowItem(hMenu, bIsContact && !bHideRoot);
 
 	for (int i = 0; i < ServerList::FTP_COUNT; i++) 
-	{
-		mi.flags = CMIM_FLAGS;
-		if (!bIsContact) 
-		{
-			mi.flags |= CMIF_HIDDEN;
-		} 
-		else if (!ftpList[i]->bEnabled)
-		{
-			mi.flags |= opt.bHideInactive ? CMIF_HIDDEN : CMIF_GRAYED;
-		}
-
-		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hSubMenu[i], (LPARAM)&mi);
-	}
-
+		Menu_ShowItem(hSubMenu[i], bIsContact && ftpList[i]->bEnabled);
 	return 0;
 }
 
 void PrebuildMainMenu()
 {
-	CLISTMENUITEM mi = { sizeof(mi) };
-	for (int i=0; i < ServerList::FTP_COUNT; i++) {
-		mi.flags = CMIM_FLAGS;
-		if (!ftpList[i]->bEnabled)
-			mi.flags |= opt.bHideInactive ? CMIF_HIDDEN : CMIF_GRAYED;
-
-		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMainSubMenu[i], (LPARAM)&mi);
-	}
+	for (int i=0; i < ServerList::FTP_COUNT; i++)
+		Menu_ShowItem(hMainSubMenu[i], ftpList[i]->bEnabled);
 }
 
 int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam) 
diff --git a/plugins/FTPFileYM/src/mir_db.cpp b/plugins/FTPFileYM/src/mir_db.cpp
index 254734c8db..63e85cc056 100644
--- a/plugins/FTPFileYM/src/mir_db.cpp
+++ b/plugins/FTPFileYM/src/mir_db.cpp
@@ -85,10 +85,10 @@ int DB::getDwordF(HANDLE hContact, char *szModule, char *szSetting, int id, int
 int DB::getAString(HANDLE hContact, char *szModule, char *szSetting, char *buff)
 {
 	DBVARIANT dbv;
-	if (!DBGetContactSettingString(hContact, szModule, szSetting, &dbv))
+	if (!db_get_s(hContact, szModule, szSetting, &dbv))
 	{
 		strcpy(buff, dbv.pszVal);
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 		return 0;
 	}
 
@@ -106,10 +106,10 @@ int DB::getAStringF(HANDLE hContact, char *szModule, char *szSetting, int id, ch
 int DB::getString(HANDLE hContact, char *szModule, char *szSetting, TCHAR *buff)
 {
 	DBVARIANT dbv;
-	if (!DBGetContactSettingTString(hContact, szModule, szSetting, &dbv))
+	if (!db_get_ts(hContact, szModule, szSetting, &dbv))
 	{
 		_tcscpy(buff, dbv.ptszVal);
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 		return 0;
 	}