From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 5 Apr 2013 22:27:16 +0000
Subject: - rest of menus cleared; - old database macroses wiped out from all
 plugins (left in m_database.h for compatibility)

git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/AvatarHistory/src/AvatarDlg.cpp     | 11 ++---------
 plugins/AvatarHistory/src/AvatarHistory.cpp | 10 +++++-----
 plugins/AvatarHistory/src/AvatarHistory.h   |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'plugins/AvatarHistory/src')

diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp
index d4d5bdcb32..ffe177923d 100644
--- a/plugins/AvatarHistory/src/AvatarDlg.cpp
+++ b/plugins/AvatarHistory/src/AvatarDlg.cpp
@@ -20,7 +20,7 @@ Avatar History Plugin
 
 #include "AvatarHistory.h"
 
-HANDLE hMenu = NULL; 
+HGENMENU hMenu = NULL; 
 DWORD WINAPI AvatarDialogThread(LPVOID param);
 static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM lParam);
 int ShowSaveDialog(HWND hwnd, TCHAR* fn,HANDLE hContact = NULL);
@@ -524,15 +524,8 @@ int CleanupAvatarPic(HWND hwnd)
 
 int PreBuildContactMenu(WPARAM wParam,LPARAM lParam) 
 {
-	CLISTMENUITEM clmi = { sizeof(clmi) };
-	clmi.flags = CMIM_FLAGS;
-
 	char *proto = GetContactProto((HANDLE)wParam);
-	if (!ProtocolEnabled(proto))
-		clmi.flags |= CMIF_HIDDEN;
-
-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenu, (LPARAM)&clmi);
-
+	Menu_ShowItem(hMenu, ProtocolEnabled(proto));
 	return 0;
 }
 
diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp
index 2c4e8e1ee2..eb77df785a 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.cpp
+++ b/plugins/AvatarHistory/src/AvatarHistory.cpp
@@ -117,7 +117,7 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	DBVARIANT dbvOldHash = {0};
-	bool ret = (DBGetContactSettingTString(hContact,MODULE_NAME,"AvatarHash",&dbvOldHash) == 0);
+	bool ret = (db_get_ts(hContact,MODULE_NAME,"AvatarHash",&dbvOldHash) == 0);
 
 	CONTACTAVATARCHANGEDNOTIFICATION* avatar = (CONTACTAVATARCHANGEDNOTIFICATION*)lParam;
 	if (avatar == NULL) {
@@ -125,13 +125,13 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam)
 			//avoid duplicate "removed avatar" notifications
 			//do not notify on an empty profile
 			ShowDebugPopup(hContact, TranslateT("AVH Debug"), TranslateT("Removed avatar, no avatar before...skipping"));
-			DBFreeVariant(&dbvOldHash);
+			db_free(&dbvOldHash);
 			return 0;
 		}
 		SkinPlaySound("avatar_removed");
 
 		// Is a flash avatar or avs could not load it
-		DBWriteContactSettingTString(hContact, MODULE_NAME, "AvatarHash", _T("-"));
+		db_set_ts(hContact, MODULE_NAME, "AvatarHash", _T("-"));
 
 		if (ContactEnabled(hContact, "AvatarPopups", AVH_DEF_AVPOPUPS) && opts.popup_show_removed)
 			ShowPopup(hContact, NULL, opts.popup_removed);
@@ -140,11 +140,11 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam)
 		if (ret && !_tcscmp(dbvOldHash.ptszVal, avatar->hash)) {
 			// same avatar hash, skipping
 			ShowDebugPopup(hContact, TranslateT("AVH Debug"), TranslateT("Hashes are the same... skipping"));
-			DBFreeVariant(&dbvOldHash);
+			db_free(&dbvOldHash);
 			return 0;
 		}
 		SkinPlaySound("avatar_changed");
-		DBWriteContactSettingTString(hContact, "AvatarHistory", "AvatarHash", avatar->hash);
+		db_set_ts(hContact, "AvatarHistory", "AvatarHash", avatar->hash);
 
 		TCHAR history_filename[MAX_PATH] = _T("");
 
diff --git a/plugins/AvatarHistory/src/AvatarHistory.h b/plugins/AvatarHistory/src/AvatarHistory.h
index af3986890a..70ac3dfd1e 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.h
+++ b/plugins/AvatarHistory/src/AvatarHistory.h
@@ -32,7 +32,7 @@
 
 // Globals
 extern HINSTANCE hInst;
-extern HANDLE hMenu;
+extern HGENMENU hMenu;
 extern DWORD mirVer;
 extern HANDLE hAvatarWindowsList;
 extern Options opts;
-- 
cgit v1.2.3