- 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

13 files changed, 205 insertions, 225 deletions

diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index bb9a883d78..e73c034968 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *url)

 {

 	DBVARIANT dbv;

-	if (!DBGetContactSettingString(ai.hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, &dbv)) {

+	if (!db_get_s(ai.hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, &dbv)) {

 		std::string new_url = dbv.pszVal;

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 

 		if (new_url.empty())

 			return false;

@@ -35,10 +35,10 @@ bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *
 		if (url)

 			*url = new_url;

 

-		if (!DBGetContactSettingTString(ai.hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv)) {

+		if (!db_get_ts(ai.hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv)) {

 			std::string ext = new_url.substr(new_url.rfind('.'));

 			std::tstring filename = GetAvatarFolder() + L'\\' + dbv.ptszVal + (TCHAR*)_A2T(ext.c_str());			

-			DBFreeVariant(&dbv);			

+			db_free(&dbv);			

 

 			ai.hContact = ai.hContact;

 			ai.format = ext_to_format(ext);

@@ -57,7 +57,7 @@ void FacebookProto::CheckAvatarChange(HANDLE hContact, std::string image_url)
 	if (image_url.empty())

 		return;

 	

-	bool big_avatars = (bool)DBGetContactSettingByte(NULL, m_szModuleName, FACEBOOK_KEY_BIG_AVATARS, DEFAULT_BIG_AVATARS);

+	bool big_avatars = (bool)db_get_b(NULL, m_szModuleName, FACEBOOK_KEY_BIG_AVATARS, DEFAULT_BIG_AVATARS);

 	

 	// We've got url to avatar of default size 32x32px, let's change it to slightly bigger (50x50px) - looks like maximum size for square format

 	std::tstring::size_type pos = image_url.rfind( "/s32x32/" );

@@ -73,17 +73,17 @@ void FacebookProto::CheckAvatarChange(HANDLE hContact, std::string image_url)
 	

 	DBVARIANT dbv;

 	bool update_required = true;

-	if (!DBGetContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, &dbv))

+	if (!db_get_s(hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, &dbv))

 	{

 		update_required = image_url != dbv.pszVal;

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 	if (update_required || !hContact)

 	{

-		DBWriteContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, image_url.c_str());

+		db_set_s(hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, image_url.c_str());

 		if (hContact)

 		{

-			DBWriteContactSettingByte(hContact, "ContactPhoto", "NeedUpdate", 1);

+			db_set_b(hContact, "ContactPhoto", "NeedUpdate", 1);

 			ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);

 		}

 		else

@@ -189,7 +189,7 @@ int FacebookProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
 		

 		bool needLoad;

 		if (AI->hContact)

-			needLoad = (wParam & GAIF_FORCE) && (!fileExist || DBGetContactSettingByte(AI->hContact, "ContactPhoto", "NeedUpdate", 0));

+			needLoad = (wParam & GAIF_FORCE) && (!fileExist || db_get_b(AI->hContact, "ContactPhoto", "NeedUpdate", 0));

 		else

 			needLoad = (wParam & GAIF_FORCE) || !fileExist;

 

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index ace8c0176d..d6dbd885d2 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -108,7 +108,7 @@ http::response facebook_client::flap( const int request_type, std::string* reque
 	    // is compaired in all communication requests

 	}

 

-	if (DBGetContactSettingByte( NULL, parent->m_szModuleName, FACEBOOK_KEY_VALIDATE_RESPONSE, 0 ) == 1)

+	if (db_get_b( NULL, parent->m_szModuleName, FACEBOOK_KEY_VALIDATE_RESPONSE, 0 ) == 1)

 		validate_response(&resp);

 

 	return resp;

@@ -122,7 +122,7 @@ bool facebook_client::validate_response( http::response* resp )
 		return false;

 	}

 

-	if (DBGetContactSettingByte( NULL, parent->m_szModuleName, FACEBOOK_KEY_VALIDATE_RESPONSE, 0 ) == 2) {

+	if (db_get_b( NULL, parent->m_szModuleName, FACEBOOK_KEY_VALIDATE_RESPONSE, 0 ) == 2) {

 		return true;

 	}

 

@@ -192,7 +192,7 @@ bool facebook_client::handle_error( std::string method, bool force_disconnect )
 

 	if ( force_disconnect )

 		result = false;

-	else if ( error_count_ <= (UINT)DBGetContactSettingByte(NULL,parent->m_szModuleName,FACEBOOK_KEY_TIMEOUTS_LIMIT,FACEBOOK_TIMEOUTS_LIMIT))

+	else if ( error_count_ <= (UINT)db_get_b(NULL,parent->m_szModuleName,FACEBOOK_KEY_TIMEOUTS_LIMIT,FACEBOOK_TIMEOUTS_LIMIT))

 		result = true;

 	else

 		result = false;

@@ -213,7 +213,7 @@ DWORD facebook_client::choose_security_level( int request_type )
 	if (this->https_)

 	{

 		if ( request_type != FACEBOOK_REQUEST_MESSAGES_RECEIVE

-			|| DBGetContactSettingByte( NULL, parent->m_szModuleName, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL, DEFAULT_FORCE_HTTPS_CHANNEL ))

+			|| db_get_b( NULL, parent->m_szModuleName, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL, DEFAULT_FORCE_HTTPS_CHANNEL ))

 			return NLHRF_SSL;

 	}

 

@@ -523,7 +523,7 @@ NETLIBHTTPHEADER* facebook_client::get_request_headers( int request_type, int* h
 

 std::string facebook_client::get_newsfeed_type( )

 {

-	BYTE feed_type = DBGetContactSettingByte(NULL, parent->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, 0);

+	BYTE feed_type = db_get_b(NULL, parent->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, 0);

 	if (feed_type < 0 || feed_type >= SIZEOF(feed_types))

 		feed_type = 0;	

 	return feed_types[feed_type].id;

@@ -658,7 +658,7 @@ bool facebook_client::login(const std::string &username,const std::string &passw
 			if ( resp.headers["Location"].find("https://") != std::string::npos )

 			{

 				client_notify(TranslateT("Your account requires HTTPS connection. Activating."));

-				DBWriteContactSettingByte(NULL, parent->m_szModuleName, FACEBOOK_KEY_FORCE_HTTPS, 1);

+				db_set_b(NULL, parent->m_szModuleName, FACEBOOK_KEY_FORCE_HTTPS, 1);

 				this->https_ = true;

 			}

 		}

@@ -667,7 +667,7 @@ bool facebook_client::login(const std::string &username,const std::string &passw
 

 	// Check for Device ID

 	if ( cookies["datr"].length())

-		DBWriteContactSettingString( NULL, parent->m_szModuleName, FACEBOOK_KEY_DEVICE_ID, cookies["datr"].c_str());

+		db_set_s( NULL, parent->m_szModuleName, FACEBOOK_KEY_DEVICE_ID, cookies["datr"].c_str());

 

 	switch ( resp.code )

 	{

@@ -715,7 +715,7 @@ bool facebook_client::login(const std::string &username,const std::string &passw
 		if ( cookies.find("c_user") != cookies.end())

 		{

 			this->self_.user_id = cookies.find("c_user")->second;

-			DBWriteContactSettingString(NULL,parent->m_szModuleName,FACEBOOK_KEY_ID,this->self_.user_id.c_str());

+			db_set_s(NULL,parent->m_szModuleName,FACEBOOK_KEY_ID,this->self_.user_id.c_str());

 			parent->Log("      Got self user id: %s", this->self_.user_id.c_str());

 			return handle_success( "login" );

 		} else {

@@ -728,7 +728,7 @@ bool facebook_client::login(const std::string &username,const std::string &passw
 

 bool facebook_client::logout( )

 {

-	if ( DBGetContactSettingByte(NULL, parent->m_szModuleName, FACEBOOK_KEY_DISABLE_LOGOUT, 0))

+	if ( db_get_b(NULL, parent->m_szModuleName, FACEBOOK_KEY_DISABLE_LOGOUT, 0))

 		return true;

 

 	handle_entry( "logout" );

@@ -1125,7 +1125,7 @@ bool facebook_client::send_message( std::string message_recipient, std::string m
 	{

 		HANDLE hContact = parent->ContactIDToHContact( message_recipient );

 		if (hContact != NULL)

-  			DBWriteContactSettingWord(hContact,parent->m_szModuleName,"Status",ID_STATUS_OFFLINE);

+  			db_set_w(hContact,parent->m_szModuleName,"Status",ID_STATUS_OFFLINE);

 		return false;

 	} break;

 

diff --git a/protocols/FacebookRM/src/connection.cpp b/protocols/FacebookRM/src/connection.cpp
index 33a168929f..799a66f50e 100644
--- a/protocols/FacebookRM/src/connection.cpp
+++ b/protocols/FacebookRM/src/connection.cpp
@@ -140,10 +140,10 @@ bool FacebookProto::NegotiateConnection( )
 	DBVARIANT dbv = {0};

 

 	error = true;

-	if ( !DBGetContactSettingString(NULL,m_szModuleName,FACEBOOK_KEY_LOGIN,&dbv))

+	if ( !db_get_s(NULL,m_szModuleName,FACEBOOK_KEY_LOGIN,&dbv))

 	{

 		user = dbv.pszVal;

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 		error = user.empty();

 	}

 	if (error)

@@ -153,12 +153,12 @@ bool FacebookProto::NegotiateConnection( )
 	}

 

 	error = true;

-	if ( !DBGetContactSettingString(NULL,m_szModuleName,FACEBOOK_KEY_PASS,&dbv))

+	if ( !db_get_s(NULL,m_szModuleName,FACEBOOK_KEY_PASS,&dbv))

 	{

 		CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1,

 			reinterpret_cast<LPARAM>(dbv.pszVal));

 		pass = dbv.pszVal;

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 		error = pass.empty();

 	}

 	if (error)

@@ -168,20 +168,20 @@ bool FacebookProto::NegotiateConnection( )
 	}

 

 	// Load machine name

-	if ( !DBGetContactSettingString(NULL,m_szModuleName,FACEBOOK_KEY_DEVICE_ID,&dbv))

+	if ( !db_get_s(NULL,m_szModuleName,FACEBOOK_KEY_DEVICE_ID,&dbv))

 	{

 		facy.cookies["datr"] = dbv.pszVal;

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	// Refresh last time of feeds update

 	facy.last_feeds_update_ = ::time(NULL);

 

 	// Get info about secured connection

-	facy.https_ = DBGetContactSettingByte(NULL, m_szModuleName, FACEBOOK_KEY_FORCE_HTTPS, DEFAULT_FORCE_HTTPS ) != 0;

+	facy.https_ = db_get_b(NULL, m_szModuleName, FACEBOOK_KEY_FORCE_HTTPS, DEFAULT_FORCE_HTTPS ) != 0;

 

 	// Create default group for new contacts

-	if (!DBGetContactSettingTString(NULL, m_szModuleName, FACEBOOK_KEY_DEF_GROUP, &dbv) && lstrlen(dbv.ptszVal) > 0)

+	if (!db_get_ts(NULL, m_szModuleName, FACEBOOK_KEY_DEF_GROUP, &dbv) && lstrlen(dbv.ptszVal) > 0)

 	{

 		CallService(MS_CLIST_GROUPCREATE, 0, (LPARAM)dbv.ptszVal);

 	}

diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index ba9107d79e..c54060a049 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -30,7 +30,7 @@ bool FacebookProto::IsMyContact(HANDLE hContact, bool include_chat)
 		if( include_chat )

 			return true;

 		else

-			return DBGetContactSettingByte(hContact,m_szModuleName,"ChatRoom",0) == 0;

+			return db_get_b(hContact,m_szModuleName,"ChatRoom",0) == 0;

 	} else {

 		return false;

 	}

@@ -46,14 +46,14 @@ HANDLE FacebookProto::ChatIDToHContact(std::string chat_id)
 			continue;

 

 		DBVARIANT dbv;

-		if( !DBGetContactSettingString(hContact,m_szModuleName,"ChatRoomID",&dbv))

+		if( !db_get_s(hContact,m_szModuleName,"ChatRoomID",&dbv))

 		{

 			if( strcmp(chat_id.c_str(),dbv.pszVal) == 0 )

 			{

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 				return hContact;

 			} else {

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 			}

 		}

 	}

@@ -71,14 +71,14 @@ HANDLE FacebookProto::ContactIDToHContact(std::string user_id)
 			continue;

 

 		DBVARIANT dbv;

-		if( !DBGetContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

+		if( !db_get_s(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

 		{

 			if( strcmp(user_id.c_str(),dbv.pszVal) == 0 )

 			{

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 				return hContact;

 			} else {

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 			}

 		}

 	}

@@ -103,19 +103,19 @@ HANDLE FacebookProto::AddToContactList(facebook_user* fbu, BYTE type, bool dont_
 	{

 		if( CallService(MS_PROTO_ADDTOCONTACT,(WPARAM)hContact,(LPARAM)m_szModuleName) == 0 )

 		{

-			DBWriteContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,fbu->user_id.c_str());

+			db_set_s(hContact,m_szModuleName,FACEBOOK_KEY_ID,fbu->user_id.c_str());

       

 			std::string homepage = FACEBOOK_URL_PROFILE + fbu->user_id;

-			DBWriteContactSettingString(hContact, m_szModuleName,"Homepage", homepage.c_str());			

-			DBWriteContactSettingString(hContact, m_szModuleName, "MirVer", fbu->status_id == ID_STATUS_ONTHEPHONE ? FACEBOOK_MOBILE : FACEBOOK_NAME);

+			db_set_s(hContact, m_szModuleName,"Homepage", homepage.c_str());			

+			db_set_s(hContact, m_szModuleName, "MirVer", fbu->status_id == ID_STATUS_ONTHEPHONE ? FACEBOOK_MOBILE : FACEBOOK_NAME);

 

-			DBDeleteContactSetting(hContact, "CList", "MyHandle");

+			db_unset(hContact, "CList", "MyHandle");

 

 			DBVARIANT dbv;

-			if( !DBGetContactSettingTString(NULL,m_szModuleName,FACEBOOK_KEY_DEF_GROUP,&dbv))

+			if( !db_get_ts(NULL,m_szModuleName,FACEBOOK_KEY_DEF_GROUP,&dbv))

 			{

-				DBWriteContactSettingTString(hContact,"CList","Group",dbv.ptszVal);

-				DBFreeVariant(&dbv);

+				db_set_ts(hContact,"CList","Group",dbv.ptszVal);

+				db_free(&dbv);

 			}

 

 			if (strlen(new_name) > 0)

@@ -124,7 +124,7 @@ HANDLE FacebookProto::AddToContactList(facebook_user* fbu, BYTE type, bool dont_
 				DBWriteContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NICK, new_name);

 			}

 			

-			DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, type);

+			db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, type);

 

 			if (getByte(FACEBOOK_KEY_DISABLE_STATUS_NOTIFY, 0))

 				CallService(MS_IGNORE_IGNORE, (WPARAM)hContact, (LPARAM)IGNOREEVENT_USERONLINE);

@@ -149,17 +149,17 @@ void FacebookProto::SetAllContactStatuses(int status, bool reset_client)
 		

 		if (reset_client) {

 			DBVARIANT dbv;

-			if (!DBGetContactSettingTString(hContact,m_szModuleName,"MirVer",&dbv)) {

+			if (!db_get_ts(hContact,m_szModuleName,"MirVer",&dbv)) {

 				if (_tcscmp(dbv.ptszVal, _T(FACEBOOK_NAME)))

-					DBWriteContactSettingTString(hContact,m_szModuleName,"MirVer", _T(FACEBOOK_NAME));

-				DBFreeVariant(&dbv);

+					db_set_ts(hContact,m_szModuleName,"MirVer", _T(FACEBOOK_NAME));

+				db_free(&dbv);

 			}

 

 

 			/*std::tstring foldername = GetAvatarFolder() + L"\\smileys\\";

 			TCHAR *path = _tcsdup(foldername.c_str());

 	

-			if (DBGetContactSettingByte(NULL,m_szModuleName,FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS)) {

+			if (db_get_b(NULL,m_szModuleName,FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS)) {

 				SMADD_CONT cont;

 				cont.cbSize = sizeof(SMADD_CONT);

 				cont.hContact = hContact;

@@ -170,8 +170,8 @@ void FacebookProto::SetAllContactStatuses(int status, bool reset_client)
 			}*/

 		}

 

-		if (DBGetContactSettingWord(hContact,m_szModuleName,"Status",ID_STATUS_OFFLINE) != status)

-			DBWriteContactSettingWord(hContact,m_szModuleName,"Status",status);

+		if (db_get_w(hContact,m_szModuleName,"Status",ID_STATUS_OFFLINE) != status)

+			db_set_w(hContact,m_szModuleName,"Status",status);

 	}

 }

 

@@ -209,9 +209,9 @@ void FacebookProto::DeleteContactFromServer(void *data)
 		// If contact wasn't deleted from database

 		if (hContact != NULL)

 		{

-			DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);

-			DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_NONE);

-			DBWriteContactSettingDword(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, ::time(NULL));

+			db_set_w(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE);

+			db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_NONE);

+			db_set_dw(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, ::time(NULL));

 		}

 		

 		NotifyEvent(m_tszUserName, TranslateT("Contact was removed from your server list."), NULL, FACEBOOK_EVENT_OTHER, NULL);

@@ -251,7 +251,7 @@ void FacebookProto::AddContactToServer(void *data)
 		// If contact wasn't deleted from database

 		if (hContact != NULL)

 		{

-			DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_REQUEST);

+			db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_REQUEST);

 		}

 				

 		NotifyEvent(m_tszUserName, TranslateT("Request for friendship was sent."), NULL, FACEBOOK_EVENT_OTHER, NULL);

@@ -280,10 +280,10 @@ void FacebookProto::ApproveContactToServer(void *data)
 	std::string get_data = "id=";

 

 	DBVARIANT dbv;

-	if (!DBGetContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv))

+	if (!db_get_s(hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv))

 	{

 		get_data += dbv.pszVal;

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	http::response resp = facy.flap( FACEBOOK_REQUEST_APPROVE_FRIEND, &post_data, &get_data );

@@ -291,7 +291,7 @@ void FacebookProto::ApproveContactToServer(void *data)
 	// Process result data

 	facy.validate_response(&resp);

 

-	DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_FRIEND);

+	db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_FRIEND);

 }

 

 void FacebookProto::CancelFriendsRequest(void *data)

@@ -309,10 +309,10 @@ void FacebookProto::CancelFriendsRequest(void *data)
 	query += "&__user=" + facy.self_.user_id;

 

 	DBVARIANT dbv;

-	if (!DBGetContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv))

+	if (!db_get_s(hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv))

 	{

 		query += "&friend=" + std::string(dbv.pszVal);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	// Get unread inbox threads

@@ -323,7 +323,7 @@ void FacebookProto::CancelFriendsRequest(void *data)
 

 	if (resp.data.find("\"payload\":null", 0) != std::string::npos)

 	{		

-		DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_NONE);

+		db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_NONE);

 		NotifyEvent(m_tszUserName, TranslateT("Request for friendship was canceled."), NULL, FACEBOOK_EVENT_OTHER, NULL);

 	} else {

 		facy.client_notify( TranslateT("Error occured when canceling friendship request."));

diff --git a/protocols/FacebookRM/src/db.h b/protocols/FacebookRM/src/db.h
index 25d3356574..f7a3a560f3 100644
--- a/protocols/FacebookRM/src/db.h
+++ b/protocols/FacebookRM/src/db.h
@@ -23,19 +23,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 

 // DB macros

-#define getByte( setting, error )           DBGetContactSettingByte( NULL, m_szModuleName, setting, error )

-#define setByte( setting, value )           DBWriteContactSettingByte( NULL, m_szModuleName, setting, value )

-#define getWord( setting, error )           DBGetContactSettingWord( NULL, m_szModuleName, setting, error )

-#define setWord( setting, value )           DBWriteContactSettingWord( NULL, m_szModuleName, setting, value )

-#define getDword( setting, error )          DBGetContactSettingDword( NULL, m_szModuleName, setting, error )

-#define setDword( setting, value )          DBWriteContactSettingDword( NULL, m_szModuleName, setting, value )

-#define getString( setting, dest )          DBGetContactSettingString( NULL, m_szModuleName, setting, dest )

-#define setString( setting, value )         DBWriteContactSettingString( NULL, m_szModuleName, setting, value )

-#define getTString( setting, dest )         DBGetContactSettingTString( NULL, m_szModuleName, setting, dest )

-#define setTString( setting, value )        DBWriteContactSettingTString( NULL, m_szModuleName, setting, value )

+#define getByte( setting, error )           db_get_b( NULL, m_szModuleName, setting, error )

+#define setByte( setting, value )           db_set_b( NULL, m_szModuleName, setting, value )

+#define getWord( setting, error )           db_get_w( NULL, m_szModuleName, setting, error )

+#define setWord( setting, value )           db_set_w( NULL, m_szModuleName, setting, value )

+#define getDword( setting, error )          db_get_dw( NULL, m_szModuleName, setting, error )

+#define setDword( setting, value )          db_set_dw( NULL, m_szModuleName, setting, value )

+#define getString( setting, dest )          db_get_s( NULL, m_szModuleName, setting, dest )

+#define setString( setting, value )         db_set_s( NULL, m_szModuleName, setting, value )

+#define getTString( setting, dest )         db_get_ts( NULL, m_szModuleName, setting, dest )

+#define setTString( setting, value )        db_set_ts( NULL, m_szModuleName, setting, value )

 #define getU8String( setting, dest )        DBGetContactSettingUTF8String( NULL, m_szModuleName, setting, dest )

 #define setU8String( setting, value )       DBWriteContactSettingUTF8String( NULL, m_szModuleName, setting, value )

-#define deleteSetting( setting )            DBDeleteContactSetting( NULL, m_szModuleName, setting )

+#define deleteSetting( setting )            db_unset( NULL, m_szModuleName, setting )

 

 // DB keys

 #define FACEBOOK_KEY_LOGIN					"Email"

diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index f30122be5d..e5bbf76d8f 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 static BOOL LoadDBCheckState(FacebookProto* ppro, HWND hwnd, int idCtrl, const char* szSetting, BYTE bDef)

 {

-	BOOL state = DBGetContactSettingByte(NULL, ppro->m_szModuleName, szSetting, bDef);

+	BOOL state = db_get_b(NULL, ppro->m_szModuleName, szSetting, bDef);

 	CheckDlgButton(hwnd, idCtrl, state);

 	return state;

 }

@@ -32,7 +32,7 @@ static BOOL LoadDBCheckState(FacebookProto* ppro, HWND hwnd, int idCtrl, const c
 static BOOL StoreDBCheckState(FacebookProto* ppro, HWND hwnd, int idCtrl, const char* szSetting)

 {

 	BOOL state = IsDlgButtonChecked(hwnd, idCtrl);

-	DBWriteContactSettingByte(NULL, ppro->m_szModuleName, szSetting, (BYTE)state);

+	db_set_b(NULL, ppro->m_szModuleName, szSetting, (BYTE)state);

 	return state;

 }

 

@@ -50,18 +50,18 @@ INT_PTR CALLBACK FBAccountProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
 		SetWindowLongPtr(hwnd,GWLP_USERDATA,lparam);

 

 		DBVARIANT dbv;

-		if ( !DBGetContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,&dbv))

+		if ( !db_get_s(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,&dbv))

 		{

 			SetDlgItemTextA(hwnd,IDC_UN,dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 

-		if ( !DBGetContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_PASS,&dbv))

+		if ( !db_get_s(0,proto->ModuleName(),FACEBOOK_KEY_PASS,&dbv))

 		{

 			CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1,

 				reinterpret_cast<LPARAM>(dbv.pszVal));

 			SetDlgItemTextA(hwnd,IDC_PW,dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 

 		if (!proto->isOffline()) {

@@ -96,11 +96,11 @@ INT_PTR CALLBACK FBAccountProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
 			char str[128];

 

 			GetDlgItemTextA(hwnd,IDC_UN,str,sizeof(str));

-			DBWriteContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,str);

+			db_set_s(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,str);

 

 			GetDlgItemTextA(hwnd,IDC_PW,str,sizeof(str));

 			CallService(MS_DB_CRYPT_ENCODESTRING,sizeof(str),reinterpret_cast<LPARAM>(str));

-			DBWriteContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_PASS,str);

+			db_set_s(0,proto->ModuleName(),FACEBOOK_KEY_PASS,str);

 

 			return TRUE;

 		}

@@ -128,10 +128,10 @@ INT_PTR CALLBACK FBMindProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpar
 

 		DBVARIANT dbv = { DBVT_TCHAR };

 

-		if (!DBGetContactSettingTString(NULL,proto->m_szModuleName,FACEBOOK_KEY_NAME,&dbv))

+		if (!db_get_ts(NULL,proto->m_szModuleName,FACEBOOK_KEY_NAME,&dbv))

 		{

 			SetWindowText( hwnd, dbv.ptszVal );

-			DBFreeVariant( &dbv );

+			db_free( &dbv );

 		}

 	}

 

@@ -196,17 +196,17 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
 		SetWindowLongPtr(hwnd,GWLP_USERDATA,lparam);

 

 		DBVARIANT dbv;

-		if ( !DBGetContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,&dbv))

+		if ( !db_get_s(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,&dbv))

 		{

 			SetDlgItemTextA(hwnd,IDC_UN,dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 

-		if ( !DBGetContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_PASS,&dbv))

+		if ( !db_get_s(0,proto->ModuleName(),FACEBOOK_KEY_PASS,&dbv))

 		{

 			CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1,reinterpret_cast<LPARAM>(dbv.pszVal));

 			SetDlgItemTextA(hwnd,IDC_PW,dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 

 		if (!proto->isOffline())

@@ -217,10 +217,10 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
 

 		SendDlgItemMessage(hwnd, IDC_GROUP, EM_LIMITTEXT, FACEBOOK_GROUP_NAME_LIMIT, 0);

 

-		if ( !DBGetContactSettingTString(0,proto->ModuleName(),FACEBOOK_KEY_DEF_GROUP,&dbv))

+		if ( !db_get_ts(0,proto->ModuleName(),FACEBOOK_KEY_DEF_GROUP,&dbv))

 		{

 			SetDlgItemText(hwnd,IDC_GROUP,dbv.ptszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 

 		LoadDBCheckState(proto, hwnd, IDC_SET_IGNORE_STATUS, FACEBOOK_KEY_DISABLE_STATUS_NOTIFY, DEFAULT_DISABLE_STATUS_NOTIFY);

@@ -255,20 +255,20 @@ INT_PTR CALLBACK FBOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
 			char str[128]; TCHAR tstr[128];

 

 			GetDlgItemTextA(hwnd,IDC_UN,str,sizeof(str));

-			DBWriteContactSettingString(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,str);

+			db_set_s(0,proto->ModuleName(),FACEBOOK_KEY_LOGIN,str);

 

 			GetDlgItemTextA(hwnd,IDC_PW,str,sizeof(str));

 			CallService(MS_DB_CRYPT_ENCODESTRING,sizeof(str),reinterpret_cast<LPARAM>(str));

-			DBWriteContactSettingString(NULL,proto->m_szModuleName,FACEBOOK_KEY_PASS,str);

+			db_set_s(NULL,proto->m_szModuleName,FACEBOOK_KEY_PASS,str);

 

 			GetDlgItemText(hwnd,IDC_GROUP,tstr,sizeof(tstr));

 			if ( lstrlen( tstr ) > 0 )

 			{

-				DBWriteContactSettingTString(NULL,proto->m_szModuleName,FACEBOOK_KEY_DEF_GROUP,tstr);

+				db_set_ts(NULL,proto->m_szModuleName,FACEBOOK_KEY_DEF_GROUP,tstr);

 				CallService( MS_CLIST_GROUPCREATE, 0, (LPARAM)tstr );

 			}

 			else

-				DBDeleteContactSetting(NULL,proto->m_szModuleName,FACEBOOK_KEY_DEF_GROUP);

+				db_unset(NULL,proto->m_szModuleName,FACEBOOK_KEY_DEF_GROUP);

 

 			StoreDBCheckState(proto, hwnd, IDC_SET_IGNORE_STATUS, FACEBOOK_KEY_DISABLE_STATUS_NOTIFY);

 			StoreDBCheckState(proto, hwnd, IDC_BIGGER_AVATARS, FACEBOOK_KEY_BIG_AVATARS);

@@ -334,10 +334,10 @@ INT_PTR CALLBACK FBOptionsAdvancedProc( HWND hwnd, UINT message, WPARAM wparam,
 			StoreDBCheckState(proto, hwnd, IDC_CUSTOM_SMILEYS, FACEBOOK_KEY_CUSTOM_SMILEYS);

 			

 			BOOL setStatus = IsDlgButtonChecked(hwnd, IDC_SET_STATUS);

-			BOOL setStatusOld = DBGetContactSettingByte(NULL, proto->m_szModuleName, FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS);

+			BOOL setStatusOld = db_get_b(NULL, proto->m_szModuleName, FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS);

 			if (setStatus != setStatusOld)

 			{

-				DBWriteContactSettingByte(NULL, proto->m_szModuleName, FACEBOOK_KEY_SET_MIRANDA_STATUS, setStatus);

+				db_set_b(NULL, proto->m_szModuleName, FACEBOOK_KEY_SET_MIRANDA_STATUS, setStatus);

 				if (setStatus && proto->isOnline())

 				{

 					ForkThread(&FacebookProto::SetAwayMsgWorker, proto, NULL);

@@ -373,7 +373,7 @@ INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 			SendDlgItemMessageA(hwnd,IDC_FEED_TYPE,CB_INSERTSTRING,i,

 				reinterpret_cast<LPARAM>(Translate(feed_types[i].name)));

 		}

-		SendDlgItemMessage(hwnd, IDC_FEED_TYPE, CB_SETCURSEL, DBGetContactSettingByte(NULL, proto->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, 0), 0);

+		SendDlgItemMessage(hwnd, IDC_FEED_TYPE, CB_SETCURSEL, db_get_b(NULL, proto->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, 0), 0);

 		LoadDBCheckState(proto, hwnd, IDC_SYSTRAY_NOTIFY, FACEBOOK_KEY_SYSTRAY_NOTIFY, DEFAULT_SYSTRAY_NOTIFY);

 

 		LoadDBCheckState(proto, hwnd, IDC_NOTIFICATIONS_ENABLE, FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE, DEFAULT_EVENT_NOTIFICATIONS_ENABLE);

@@ -381,18 +381,18 @@ INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 		LoadDBCheckState(proto, hwnd, IDC_CLIENT_ENABLE, FACEBOOK_KEY_EVENT_CLIENT_ENABLE, DEFAULT_EVENT_CLIENT_ENABLE);

 		LoadDBCheckState(proto, hwnd, IDC_OTHER_ENABLE, FACEBOOK_KEY_EVENT_OTHER_ENABLE, DEFAULT_EVENT_OTHER_ENABLE);

 

-		SendDlgItemMessage(hwnd, IDC_COLBACK, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLBACK,DEFAULT_EVENT_COLBACK));

-		SendDlgItemMessage(hwnd, IDC_COLTEXT, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLTEXT,DEFAULT_EVENT_COLTEXT));

-		SetDlgItemInt(hwnd, IDC_TIMEOUT,DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_TIMEOUT, 0),TRUE);

-		SendDlgItemMessage(hwnd, IDC_COLBACK2, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLBACK,DEFAULT_EVENT_COLBACK));

-		SendDlgItemMessage(hwnd, IDC_COLTEXT2, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLTEXT,DEFAULT_EVENT_COLTEXT));

-		SetDlgItemInt(hwnd, IDC_TIMEOUT2,DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_TIMEOUT, 0),TRUE);

-		SendDlgItemMessage(hwnd, IDC_COLBACK3, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLBACK,DEFAULT_EVENT_COLBACK));

-		SendDlgItemMessage(hwnd, IDC_COLTEXT3, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLTEXT,DEFAULT_EVENT_COLTEXT));

-		SetDlgItemInt(hwnd, IDC_TIMEOUT3,DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_TIMEOUT, 0),TRUE);

-		SendDlgItemMessage(hwnd, IDC_COLBACK4, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLBACK,DEFAULT_EVENT_COLBACK));

-		SendDlgItemMessage(hwnd, IDC_COLTEXT4, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLTEXT,DEFAULT_EVENT_COLTEXT));

-		SetDlgItemInt(hwnd, IDC_TIMEOUT4,DBGetContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_TIMEOUT, 0),TRUE);

+		SendDlgItemMessage(hwnd, IDC_COLBACK, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLBACK,DEFAULT_EVENT_COLBACK));

+		SendDlgItemMessage(hwnd, IDC_COLTEXT, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLTEXT,DEFAULT_EVENT_COLTEXT));

+		SetDlgItemInt(hwnd, IDC_TIMEOUT,db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_TIMEOUT, 0),TRUE);

+		SendDlgItemMessage(hwnd, IDC_COLBACK2, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLBACK,DEFAULT_EVENT_COLBACK));

+		SendDlgItemMessage(hwnd, IDC_COLTEXT2, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLTEXT,DEFAULT_EVENT_COLTEXT));

+		SetDlgItemInt(hwnd, IDC_TIMEOUT2,db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_TIMEOUT, 0),TRUE);

+		SendDlgItemMessage(hwnd, IDC_COLBACK3, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLBACK,DEFAULT_EVENT_COLBACK));

+		SendDlgItemMessage(hwnd, IDC_COLTEXT3, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLTEXT,DEFAULT_EVENT_COLTEXT));

+		SetDlgItemInt(hwnd, IDC_TIMEOUT3,db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_TIMEOUT, 0),TRUE);

+		SendDlgItemMessage(hwnd, IDC_COLBACK4, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLBACK,DEFAULT_EVENT_COLBACK));

+		SendDlgItemMessage(hwnd, IDC_COLTEXT4, CPM_SETCOLOUR, 0, db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLTEXT,DEFAULT_EVENT_COLTEXT));

+		SetDlgItemInt(hwnd, IDC_TIMEOUT4,db_get_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_TIMEOUT, 0),TRUE);

 

 		LoadDBCheckState(proto, hwnd, IDC_NOTIFICATIONS_DEFAULT, FACEBOOK_KEY_EVENT_NOTIFICATIONS_DEFAULT, 0);

 		LoadDBCheckState(proto, hwnd, IDC_FEEDS_DEFAULT, FACEBOOK_KEY_EVENT_FEEDS_DEFAULT, 0);

@@ -446,7 +446,7 @@ INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 	{

 		if ( reinterpret_cast<NMHDR*>(lparam)->code == PSN_APPLY )

 		{			

-			DBWriteContactSettingByte(NULL, proto->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, SendDlgItemMessage(hwnd, IDC_FEED_TYPE, CB_GETCURSEL, 0, 0));

+			db_set_b(NULL, proto->m_szModuleName, FACEBOOK_KEY_FEED_TYPE, SendDlgItemMessage(hwnd, IDC_FEED_TYPE, CB_GETCURSEL, 0, 0));

 

 			StoreDBCheckState(proto, hwnd, IDC_SYSTRAY_NOTIFY, FACEBOOK_KEY_SYSTRAY_NOTIFY);

 

@@ -460,21 +460,21 @@ INT_PTR CALLBACK FBEventsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 			StoreDBCheckState(proto, hwnd, IDC_OTHER_DEFAULT, FACEBOOK_KEY_EVENT_OTHER_DEFAULT);

 			StoreDBCheckState(proto, hwnd, IDC_CLIENT_DEFAULT, FACEBOOK_KEY_EVENT_CLIENT_DEFAULT);

 

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT,NULL,TRUE));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT,NULL,TRUE));

 			

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK2,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT2,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT2,NULL,TRUE));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK2,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT2,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_FEEDS_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT2,NULL,TRUE));

 

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK3,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT3,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT3,NULL,TRUE));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK3,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT3,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_OTHER_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT3,NULL,TRUE));

 

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK4,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT4,CPM_GETCOLOUR,0,0));

-			DBWriteContactSettingDword(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT4,NULL,TRUE));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLBACK, SendDlgItemMessage(hwnd,IDC_COLBACK4,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_COLTEXT, SendDlgItemMessage(hwnd,IDC_COLTEXT4,CPM_GETCOLOUR,0,0));

+			db_set_dw(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_CLIENT_TIMEOUT, GetDlgItemInt(hwnd,IDC_TIMEOUT4,NULL,TRUE));

 		}

 	}

 	return TRUE;

diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index f12740a111..89e2359dfa 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -433,7 +433,7 @@ int facebook_json_parser::parse_messages( void* data, std::vector< facebook_mess
 			}

 			else if ( type.Value() == "notification_json" ) // event notification

 			{

-				if (!DBGetContactSettingByte(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE, DEFAULT_EVENT_NOTIFICATIONS_ENABLE))

+				if (!db_get_b(NULL, proto->m_szModuleName, FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE, DEFAULT_EVENT_NOTIFICATIONS_ENABLE))

 					continue;

 

 				const Array& notificationsArray = objMember["nodes"];

@@ -470,8 +470,8 @@ int facebook_json_parser::parse_messages( void* data, std::vector< facebook_mess
 

 				HANDLE hContact = proto->AddToContactList(&fbu, FACEBOOK_CONTACT_FRIEND);

 				

-				if ( DBGetContactSettingWord(hContact,proto->m_szModuleName,"Status", 0) == ID_STATUS_OFFLINE )

-					DBWriteContactSettingWord(hContact,proto->m_szModuleName,"Status",ID_STATUS_ONLINE);

+				if ( db_get_w(hContact,proto->m_szModuleName,"Status", 0) == ID_STATUS_OFFLINE )

+					db_set_w(hContact,proto->m_szModuleName,"Status",ID_STATUS_ONLINE);

 

 				const Number& state = objMember["st"];

 				if (state.Value() == 1)

diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp
index 85a9f3c17a..52faf83b0d 100644
--- a/protocols/FacebookRM/src/messages.cpp
+++ b/protocols/FacebookRM/src/messages.cpp
@@ -26,10 +26,10 @@ int FacebookProto::RecvMsg(HANDLE hContact, PROTORECVEVENT *pre)
 {

 	DBVARIANT dbv;

 

-	if ( !DBGetContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

+	if ( !db_get_s(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

 	{

 		ForkThread( &FacebookProto::MessagingWorker, this, new send_messaging(dbv.pszVal, FACEBOOK_RECV_MESSAGE ));

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF);

@@ -52,7 +52,7 @@ void FacebookProto::SendMsgWorker(void *p)
 	{

 		ProtoBroadcastAck(m_szModuleName, data->hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, data->msgid, (LPARAM)Translate("You cannot send messages when you are offline."));

 	}

-	else if ( !DBGetContactSettingString(data->hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

+	else if ( !db_get_s(data->hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

 	{

 		//parseSmileys(data->msg, data->hContact);

 

@@ -70,7 +70,7 @@ void FacebookProto::SendMsgWorker(void *p)
 			char *err = mir_utf8decodeA(error_text.c_str());

 			ProtoBroadcastAck(m_szModuleName,data->hContact,ACKTYPE_MESSAGE,ACKRESULT_FAILED, data->msgid,(LPARAM)err);

 		}

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	delete data;

@@ -88,9 +88,9 @@ void FacebookProto::SendChatMsgWorker(void *p)
 	if (hContact) {		

 		std::string tid;

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_TID, &dbv)) {

+		if (!db_get_s(hContact, m_szModuleName, FACEBOOK_KEY_TID, &dbv)) {

 			tid = dbv.pszVal;

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		} else {

 			std::string post_data = "threads[group_ids][0]=" + data->chat_id;

 			post_data += "&fb_dtsg=" + (facy.dtsg_.length() ? facy.dtsg_ : "0");

@@ -101,7 +101,7 @@ void FacebookProto::SendChatMsgWorker(void *p)
 			facy.validate_response(&resp);

 

 			tid = utils::text::source_get_value(&resp.data, 2, "\"thread_id\":\"", "\"");

-			DBWriteContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_TID, tid.c_str());

+			db_set_s(hContact, m_szModuleName, FACEBOOK_KEY_TID, tid.c_str());

 			Log("      Got thread info: %s = %s", data->chat_id.c_str(), tid.c_str());

 		}		

 		

@@ -139,8 +139,8 @@ void FacebookProto::SendTypingWorker(void *p)
 	send_typing *typing = static_cast<send_typing*>(p);

 

 	// Dont send typing notifications to contacts, that are offline or not friends

-	if ( DBGetContactSettingWord(typing->hContact,m_szModuleName,"Status", 0) == ID_STATUS_OFFLINE

-		|| DBGetContactSettingByte(typing->hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND)

+	if ( db_get_w(typing->hContact,m_szModuleName,"Status", 0) == ID_STATUS_OFFLINE

+		|| db_get_b(typing->hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND)

 		return;

 

 	// TODO RM: maybe better send typing optimalization

@@ -154,7 +154,7 @@ void FacebookProto::SendTypingWorker(void *p)
 	}

 		

 	DBVARIANT dbv;

-	if ( !DBGetContactSettingString(typing->hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

+	if ( !db_get_s(typing->hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

 	{

 		std::string data = "&source=mercury-chat";

 		data += (typing->status == PROTOTYPE_SELFTYPING_ON ? "&typ=1" : "&typ=0"); // PROTOTYPE_SELFTYPING_OFF

@@ -164,7 +164,7 @@ void FacebookProto::SendTypingWorker(void *p)
 		

 		http::response resp = facy.flap( FACEBOOK_REQUEST_TYPING_SEND, &data );

 

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}		

 

 	delete typing;

@@ -185,7 +185,7 @@ void FacebookProto::MessagingWorker(void *p)
 

 void FacebookProto::parseSmileys(std::string message, HANDLE hContact)

 {

-	if (!DBGetContactSettingByte(NULL,m_szModuleName,FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS))

+	if (!db_get_b(NULL,m_szModuleName,FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS))

 		return;

 

 	HANDLE nlc = NULL;

diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index a89862a2f4..c1e4dcea1f 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -42,7 +42,7 @@ void FacebookProto::ProcessBuddyList( void* data )
 	p->parse_buddy_list( data, &facy.buddies );

 	delete p;

 

-	bool use_mobile_status = DBGetContactSettingByte(NULL,m_szModuleName,FACEBOOK_KEY_LOAD_MOBILE, DEFAULT_LOAD_MOBILE) != 0;

+	bool use_mobile_status = db_get_b(NULL,m_szModuleName,FACEBOOK_KEY_LOAD_MOBILE, DEFAULT_LOAD_MOBILE) != 0;

 

 	for ( List::Item< facebook_user >* i = facy.buddies.begin( ); i != NULL; )

 	{		

@@ -73,19 +73,19 @@ void FacebookProto::ProcessBuddyList( void* data )
 			

 			DBVARIANT dbv;

 			TCHAR* client = on_mobile ? _T(FACEBOOK_MOBILE) : _T(FACEBOOK_NAME);

-			if (!DBGetContactSettingTString(hContact,m_szModuleName,"MirVer",&dbv)) {

+			if (!db_get_ts(hContact,m_szModuleName,"MirVer",&dbv)) {

 				if (_tcscmp(dbv.ptszVal, client))

-					DBWriteContactSettingTString(hContact,m_szModuleName,"MirVer",client);

-				DBFreeVariant(&dbv);

+					db_set_ts(hContact,m_szModuleName,"MirVer",client);

+				db_free(&dbv);

 			} else {

-				DBWriteContactSettingTString(hContact,m_szModuleName,"MirVer",client);

+				db_set_ts(hContact,m_szModuleName,"MirVer",client);

 			}

 		}

 

 		if (fbu->status_id == ID_STATUS_OFFLINE || fbu->deleted)

 		{

 			if (fbu->handle)

-				DBWriteContactSettingWord(fbu->handle, m_szModuleName, "Status", ID_STATUS_OFFLINE);

+				db_set_w(fbu->handle, m_szModuleName, "Status", ID_STATUS_OFFLINE);

 

 			std::string to_delete( i->key );

 			i = i->next;

@@ -102,18 +102,18 @@ void FacebookProto::ProcessBuddyList( void* data )
 				}

 			}

 

-			if (DBGetContactSettingWord(fbu->handle,m_szModuleName,"Status", 0) != fbu->status_id ) {

-				DBWriteContactSettingWord(fbu->handle,m_szModuleName,"Status", fbu->status_id );

+			if (db_get_w(fbu->handle,m_szModuleName,"Status", 0) != fbu->status_id ) {

+				db_set_w(fbu->handle,m_szModuleName,"Status", fbu->status_id );

 			}

 

-			if (DBGetContactSettingByte(fbu->handle, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND) {

-				DBWriteContactSettingByte(fbu->handle, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_FRIEND);

+			if (db_get_b(fbu->handle, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND) {

+				db_set_b(fbu->handle, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_FRIEND);

 				// TODO: remove that popup and use "Contact added you" event?

 			}

 

 			// Wasn't contact removed from "server-list" someday?

-			if ( DBGetContactSettingDword(fbu->handle, m_szModuleName, FACEBOOK_KEY_DELETED, 0)) {

-				DBDeleteContactSetting(fbu->handle, m_szModuleName, FACEBOOK_KEY_DELETED);

+			if ( db_get_dw(fbu->handle, m_szModuleName, FACEBOOK_KEY_DELETED, 0)) {

+				db_unset(fbu->handle, m_szModuleName, FACEBOOK_KEY_DELETED);

 

 				std::string url = FACEBOOK_URL_PROFILE + fbu->user_id;					

 

@@ -169,9 +169,9 @@ void FacebookProto::ProcessFriendList( void* data )
 

 		DBVARIANT dbv;

 		facebook_user *fbu;

-		if ( !DBGetContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv)) {

+		if ( !db_get_s(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv)) {

 			std::string id = dbv.pszVal;

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 			

 			std::map< std::string, facebook_user* >::iterator iter;

 			

@@ -185,14 +185,14 @@ void FacebookProto::ProcessFriendList( void* data )
 				// TODO RM: remove, because contacts cant change it, so its only for "first run"

 					// - but what with contacts, that was added after logon?

 				// Update gender

-				if ( DBGetContactSettingByte(hContact, m_szModuleName, "Gender", 0) != fbu->gender )

-					DBWriteContactSettingByte(hContact, m_szModuleName, "Gender", fbu->gender);

+				if ( db_get_b(hContact, m_szModuleName, "Gender", 0) != fbu->gender )

+					db_set_b(hContact, m_szModuleName, "Gender", fbu->gender);

 

 				// Update real name

 				if ( !DBGetContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NAME, &dbv))

 				{

 					update_required = strcmp( dbv.pszVal, fbu->real_name.c_str()) != 0;

-					DBFreeVariant(&dbv);

+					db_free(&dbv);

 				}

 				if ( update_required )

 				{

@@ -200,14 +200,14 @@ void FacebookProto::ProcessFriendList( void* data )
 					DBWriteContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NICK, fbu->real_name.c_str());

 				}

 

-				if (DBGetContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND) {

-					DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_FRIEND);

+				if (db_get_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND) {

+					db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_FRIEND);

 					// TODO: remove that popup and use "Contact added you" event?

 				}

 

 				// Wasn't contact removed from "server-list" someday?

-				if ( DBGetContactSettingDword(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, 0)) {

-					DBDeleteContactSetting(hContact, m_szModuleName, FACEBOOK_KEY_DELETED);

+				if ( db_get_dw(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, 0)) {

+					db_unset(hContact, m_szModuleName, FACEBOOK_KEY_DELETED);

 

 					std::string url = FACEBOOK_URL_PROFILE + fbu->user_id;					

 

@@ -227,17 +227,17 @@ void FacebookProto::ProcessFriendList( void* data )
 				// Contact was removed from "server-list", notify it

 

 				// Wasnt we already been notified about this contact? And was this real friend?

-				if (!DBGetContactSettingDword(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, 0) 

-					&& DBGetContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) == FACEBOOK_CONTACT_FRIEND)

+				if (!db_get_dw(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, 0) 

+					&& db_get_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) == FACEBOOK_CONTACT_FRIEND)

 				{

 

-					DBWriteContactSettingDword(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, ::time(NULL));

-					DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_NONE);

+					db_set_dw(hContact, m_szModuleName, FACEBOOK_KEY_DELETED, ::time(NULL));

+					db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_NONE);

 

 					std::string contactname = id;

 					if ( !DBGetContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NAME, &dbv)) {

 						contactname = dbv.pszVal;

-						DBFreeVariant(&dbv);

+						db_free(&dbv);

 					}

 

 					std::string url = FACEBOOK_URL_PROFILE + id;

@@ -259,11 +259,11 @@ void FacebookProto::ProcessFriendList( void* data )
 		

 		HANDLE hContact = AddToContactList(fbu, FACEBOOK_CONTACT_FRIEND, true); // This contact is surely new

 

-		DBWriteContactSettingByte(hContact, m_szModuleName, "Gender", fbu->gender );

+		db_set_b(hContact, m_szModuleName, "Gender", fbu->gender );

 		DBWriteContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NAME, fbu->real_name.c_str());

 		DBWriteContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NICK, fbu->real_name.c_str());

-		DBWriteContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, fbu->image_url.c_str());

-//		DBWriteContactSettingWord(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE );

+		db_set_s(hContact, m_szModuleName, FACEBOOK_KEY_AV_URL, fbu->image_url.c_str());

+//		db_set_w(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE );

 	}

 

 	LOG("***** Friend list processed");

@@ -595,19 +595,19 @@ void FacebookProto::ProcessFriendRequests( void* )
 		if (fbu->user_id.length() && fbu->real_name.length())

 		{

 			HANDLE hContact = AddToContactList(fbu, FACEBOOK_CONTACT_APPROVE, false, fbu->real_name.c_str());

-			DBWriteContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_APPROVE);

+			db_set_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, FACEBOOK_CONTACT_APPROVE);

 

 			bool seen = false;

 

 			DBVARIANT dbv;

-			if (!DBGetContactSettingString(hContact, m_szModuleName, "RequestTime", &dbv)) {

+			if (!db_get_s(hContact, m_szModuleName, "RequestTime", &dbv)) {

 				seen = !strcmp(dbv.pszVal, time.c_str());

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 			}

 

 			if (!seen) {

 				// This is new request

-				DBWriteContactSettingString(hContact, m_szModuleName, "RequestTime", time.c_str());

+				db_set_s(hContact, m_szModuleName, "RequestTime", time.c_str());

 

 				//blob is: uin( DWORD ), hContact( HANDLE ), nick( ASCIIZ ), first( ASCIIZ ), last( ASCIIZ ), email( ASCIIZ ), reason( ASCIIZ )

 				//blob is: 0( DWORD ), hContact( HANDLE ), nick( ASCIIZ ), ""( ASCIIZ ), ""( ASCIIZ ), ""( ASCIIZ ), ""( ASCIIZ )

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 5b88516ffe..3dbaebea54 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -156,7 +156,7 @@ int FacebookProto::SetStatus( int new_status )
 	case ID_STATUS_IDLE:

 	default:

 		m_iDesiredStatus = ID_STATUS_INVISIBLE;

-		if (DBGetContactSettingByte(NULL,m_szModuleName,FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES))

+		if (db_get_b(NULL,m_szModuleName,FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES))

 			break;

 	case ID_STATUS_ONLINE:

 	case ID_STATUS_FREECHAT:

@@ -247,13 +247,13 @@ HANDLE FacebookProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	if (hContact) {

 		if (flags & PALF_TEMPORARY)

 		{

-			DBWriteContactSettingByte(hContact, "Clist", "Hidden", 1);

-			DBWriteContactSettingByte(hContact, "Clist", "NotOnList", 1);

+			db_set_b(hContact, "Clist", "Hidden", 1);

+			db_set_b(hContact, "Clist", "NotOnList", 1);

 		}

-		else if (DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

+		else if (db_get_b(hContact, "CList", "NotOnList", 0))

 		{

-			DBDeleteContactSetting(hContact, "CList", "Hidden");

-			DBDeleteContactSetting(hContact, "CList", "NotOnList");

+			db_unset(hContact, "CList", "Hidden");

+			db_unset(hContact, "CList", "NotOnList");

 		}

 	}

 

@@ -294,7 +294,7 @@ int FacebookProto::AuthDeny(HANDLE hDbEvent, const PROTOCHAR *reason)
 

 		// TODO: hide from facebook requests list

 

-		if (DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

+		if (db_get_b(hContact, "CList", "NotOnList", 0))

 			CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

 

 		return 0;

@@ -312,7 +312,7 @@ int FacebookProto::GetMyAwayMsg( WPARAM wParam, LPARAM lParam )
 	if ( !getTString( "StatusMsg", &dbv ) && lstrlen( dbv.ptszVal ) != 0 )

 	{

 		int res = (lParam & SGMA_UNICODE) ? (INT_PTR)mir_t2u(dbv.ptszVal) : (INT_PTR)mir_t2a(dbv.ptszVal);

-		DBFreeVariant( &dbv );

+		db_free( &dbv );

 		return res;

 	} else {

 		return 0;

@@ -470,15 +470,15 @@ int FacebookProto::VisitProfile(WPARAM wParam,LPARAM lParam)
 

 	// TODO: why isn't wParam == 0 when is status menu moved to main menu?

 	if (wParam != 0 && IsMyContact(hContact)) {

-		if (!DBGetContactSettingString(hContact, m_szModuleName, "Homepage", &dbv)) {

+		if (!db_get_s(hContact, m_szModuleName, "Homepage", &dbv)) {

 			// Homepage link already present, get it

 			url = dbv.pszVal;

-			DBFreeVariant(&dbv);

-		} else if (!DBGetContactSettingString(hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv)) {

+			db_free(&dbv);

+		} else if (!db_get_s(hContact, m_szModuleName, FACEBOOK_KEY_ID, &dbv)) {

 			// No homepage link, create and save it

 			url += dbv.pszVal;

-			DBWriteContactSettingString(hContact, m_szModuleName, "Homepage", url.c_str());

-			DBFreeVariant(&dbv);

+			db_set_s(hContact, m_szModuleName, "Homepage", url.c_str());

+			db_free(&dbv);

 		}

 	}

 

@@ -497,24 +497,24 @@ int FacebookProto::CancelFriendship(WPARAM wParam,LPARAM lParam)
 	HANDLE hContact = reinterpret_cast<HANDLE>(wParam);

 

 	// Ignore groupchats and, if deleting, also not-friends

-	if (DBGetContactSettingByte(hContact, m_szModuleName, "ChatRoom", 0)

-		|| (deleting && DBGetContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND))

+	if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0)

+		|| (deleting && db_get_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND))

 		return 0;

 

 	DBVARIANT dbv;

 	TCHAR tstr[256];

 

-	if ( !DBGetContactSettingTString(hContact, m_szModuleName, FACEBOOK_KEY_NAME, &dbv)) {

+	if ( !db_get_ts(hContact, m_szModuleName, FACEBOOK_KEY_NAME, &dbv)) {

 		mir_sntprintf(tstr,SIZEOF(tstr),TranslateT("Do you want to cancel your friendship with '%s'?"), dbv.ptszVal);

-		DBFreeVariant(&dbv);

-	} else if ( !DBGetContactSettingTString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv)) {

+		db_free(&dbv);

+	} else if ( !db_get_ts(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv)) {

 		mir_sntprintf(tstr,SIZEOF(tstr),TranslateT("Do you want to cancel your friendship with '%s'?"), dbv.ptszVal);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	if (MessageBox( 0, tstr, m_tszUserName, MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2 ) == IDYES) {

 

-		if ( !DBGetContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

+		if ( !db_get_s(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

 		{

 			std::string* id = new std::string(dbv.pszVal);

 

@@ -526,7 +526,7 @@ int FacebookProto::CancelFriendship(WPARAM wParam,LPARAM lParam)
 			}

 

 			ForkThread( &FacebookProto::DeleteContactFromServer, this, ( void* )id );

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 

 	}

@@ -542,11 +542,11 @@ int FacebookProto::RequestFriendship(WPARAM wParam,LPARAM lParam)
 	HANDLE hContact = reinterpret_cast<HANDLE>(wParam);

 

 	DBVARIANT dbv;

-	if ( !DBGetContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

+	if ( !db_get_s(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv))

 	{

 		std::string* id = new std::string(dbv.pszVal);

 		ForkThread( &FacebookProto::AddContactToServer, this, ( void* )id );

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	return 0;

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index c71e8df0bc..f2b14ce3bf 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -63,9 +63,7 @@ char *GetIconDescription(const char* name)
 }

 

 // Contact List menu stuff

-HANDLE hHookPreBuildMenu;

-HANDLE g_hContactMenuItems[CMITEMS_COUNT];

-HANDLE g_hContactMenuSvc[CMITEMS_COUNT];

+HGENMENU g_hContactMenuItems[CMITEMS_COUNT];

 

 // Helper functions

 static FacebookProto * GetInstanceByHContact(HANDLE hContact)

@@ -91,9 +89,7 @@ INT_PTR GlobalService(WPARAM wParam,LPARAM lParam)
 static int PrebuildContactMenu(WPARAM wParam,LPARAM lParam)

 {

 	for (size_t i=0; i<SIZEOF(g_hContactMenuItems); i++)

-	{

-		EnableMenuItem(g_hContactMenuItems[i], false);

-	}

+		Menu_ShowItem(g_hContactMenuItems[i], false);

 

 	FacebookProto *proto = GetInstanceByHContact(reinterpret_cast<HANDLE>(wParam));

 	return proto ? proto->OnPrebuildContactMenu(wParam,lParam) : 0;

@@ -101,7 +97,7 @@ static int PrebuildContactMenu(WPARAM wParam,LPARAM lParam)
 

 void InitContactMenus()

 {

-	hHookPreBuildMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU,PrebuildContactMenu);

+	HookEvent(ME_CLIST_PREBUILDCONTACTMENU,PrebuildContactMenu);

 

 	CLISTMENUITEM mi = {sizeof(mi)};

 	mi.flags = CMIF_ICONFROMICOLIB;

@@ -110,35 +106,35 @@ void InitContactMenus()
 	mi.icolibItem = GetIconHandle("homepage");

 	mi.pszName = GetIconDescription("homepage");

 	mi.pszService = "FacebookProto/VisitProfile";

-	g_hContactMenuSvc[CMI_VISIT_PROFILE] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::VisitProfile>);

+	CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::VisitProfile>);

 	g_hContactMenuItems[CMI_VISIT_PROFILE] = Menu_AddContactMenuItem(&mi);

 

 	mi.position=-2000006001;

 	mi.icolibItem = GetIconHandle("authRevoke");

 	mi.pszName = GetIconDescription("authRevoke");

 	mi.pszService = "FacebookProto/CancelFriendship";

-	g_hContactMenuSvc[CMI_AUTH_REVOKE] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::CancelFriendship>);

+	CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::CancelFriendship>);

 	g_hContactMenuItems[CMI_AUTH_REVOKE] = Menu_AddContactMenuItem(&mi);

 

 	mi.position=-2000006001;

 	mi.icolibItem = GetIconHandle("authRevokeReq");

 	mi.pszName = GetIconDescription("authRevokeReq");

 	mi.pszService = "FacebookProto/CancelFriendshipRequest";

-	g_hContactMenuSvc[CMI_AUTH_CANCEL] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::OnCancelFriendshipRequest>);

+	CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::OnCancelFriendshipRequest>);

 	g_hContactMenuItems[CMI_AUTH_CANCEL] = Menu_AddContactMenuItem(&mi);

 

 	mi.position=-2000006002;

 	mi.icolibItem = GetIconHandle("authAsk");

 	mi.pszName = GetIconDescription("authAsk");

 	mi.pszService = "FacebookProto/RequestFriendship";

-	g_hContactMenuSvc[CMI_AUTH_ASK] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::RequestFriendship>);

+	CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::RequestFriendship>);

 	g_hContactMenuItems[CMI_AUTH_ASK] = Menu_AddContactMenuItem(&mi);

 

 	mi.position=-2000006003;

 	mi.icolibItem = GetIconHandle("authGrant");

 	mi.pszName = GetIconDescription("authGrant");

 	mi.pszService = "FacebookProto/ApproveFriendship";

-	g_hContactMenuSvc[CMI_AUTH_GRANT] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::ApproveFriendship>);

+	CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::ApproveFriendship>);

 	g_hContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);

 }

 

@@ -146,39 +142,24 @@ void UninitContactMenus()
 {

 	for(size_t i=0; i<SIZEOF(g_hContactMenuItems); i++)

 		CallService(MS_CLIST_REMOVECONTACTMENUITEM,(WPARAM)g_hContactMenuItems[i],0);

-

-	for(size_t i=0; i<SIZEOF(g_hContactMenuSvc); i++)

-		DestroyServiceFunction(g_hContactMenuSvc[i]);

-	

-	UnhookEvent(hHookPreBuildMenu);

-}

-

-void EnableMenuItem(HANDLE hMenuItem, bool enable)

-{

-	CLISTMENUITEM clmi = { sizeof(clmi) };

-	clmi.flags = CMIM_FLAGS;

-	if (!enable)

-		clmi.flags |= CMIF_HIDDEN;

-

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuItem, (LPARAM)&clmi);

 }

 

 int FacebookProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam)

 {	

 	HANDLE hContact = reinterpret_cast<HANDLE>(wParam);

 

-	EnableMenuItem(g_hContactMenuItems[CMI_VISIT_PROFILE], true);

+	Menu_ShowItem(g_hContactMenuItems[CMI_VISIT_PROFILE], true);

 

-	if (!isOffline() && !DBGetContactSettingByte(hContact, m_szModuleName, "ChatRoom", 0))

+	if (!isOffline() && !db_get_b(hContact, m_szModuleName, "ChatRoom", 0))

 	{

 		bool ctrlPressed = (GetKeyState(VK_CONTROL) & 0x8000) != 0;

 

-		BYTE type = DBGetContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0);

+		BYTE type = db_get_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0);

 

-		EnableMenuItem(g_hContactMenuItems[CMI_AUTH_ASK], ctrlPressed || type == FACEBOOK_CONTACT_NONE || !type);

-		EnableMenuItem(g_hContactMenuItems[CMI_AUTH_GRANT], ctrlPressed || type == FACEBOOK_CONTACT_APPROVE);

-		EnableMenuItem(g_hContactMenuItems[CMI_AUTH_REVOKE], ctrlPressed || type == FACEBOOK_CONTACT_FRIEND);

-		EnableMenuItem(g_hContactMenuItems[CMI_AUTH_CANCEL], ctrlPressed || type == FACEBOOK_CONTACT_REQUEST);		

+		Menu_ShowItem(g_hContactMenuItems[CMI_AUTH_ASK], ctrlPressed || type == FACEBOOK_CONTACT_NONE || !type);

+		Menu_ShowItem(g_hContactMenuItems[CMI_AUTH_GRANT], ctrlPressed || type == FACEBOOK_CONTACT_APPROVE);

+		Menu_ShowItem(g_hContactMenuItems[CMI_AUTH_REVOKE], ctrlPressed || type == FACEBOOK_CONTACT_FRIEND);

+		Menu_ShowItem(g_hContactMenuItems[CMI_AUTH_CANCEL], ctrlPressed || type == FACEBOOK_CONTACT_REQUEST);		

 	}

 

 	return 0;

diff --git a/protocols/FacebookRM/src/theme.h b/protocols/FacebookRM/src/theme.h
index 9f130958f6..e86bfa995b 100644
--- a/protocols/FacebookRM/src/theme.h
+++ b/protocols/FacebookRM/src/theme.h
@@ -27,7 +27,6 @@ HANDLE GetIconHandle(const char *name);
 

 void InitContactMenus(void);

 void UninitContactMenus(void);

-void EnableMenuItem(HANDLE hMenuItem, bool enable);

 

 /* Contact menu item indexes */

 #define CMI_VISIT_PROFILE 0

diff --git a/protocols/FacebookRM/src/utils.cpp b/protocols/FacebookRM/src/utils.cpp
index 77772175d9..ea1518f841 100644
--- a/protocols/FacebookRM/src/utils.cpp
+++ b/protocols/FacebookRM/src/utils.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 std::string utils::url::encode(const std::string &s)

 {

-	return mir_ptr<char>( mir_urlEncode( s.c_str()));

+	return (char*)mir_ptr<char>( mir_urlEncode( s.c_str()));

 }

 

 std::string utils::url::decode(std::string data)