From 097c52ad9a2928422084bf76cebee58958341574 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 7 Apr 2013 19:47:13 +0000
Subject: end of the old database macroses

git-svn-id: http://svn.miranda-ng.org/main/trunk@4373 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ContactsPlus/src/utils.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'plugins/ContactsPlus/src/utils.cpp')

diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index 78f5fa52e6..6c3ac3d073 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -109,21 +109,16 @@ char *GetContactUID(HANDLE hContact, int bTchar)
     return null_strdup(szUid);
 }
 
-
 TCHAR* MirandaStatusToStringT(int mirandaStatus)
 {
-  return (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, mirandaStatus, GSMDF_UNICODE);
+	return (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, mirandaStatus, GSMDF_UNICODE);
 }
 
 int DBGetContactSettingT(HANDLE hContact, const char *szModule, const char* szSetting, DBVARIANT *dbv)
 {
-  if (ServiceExists(MS_DB_CONTACT_GETSETTING_STR))
-    return DBGetContactSettingW(hContact, szModule, szSetting, dbv);
-  else
-    return db_get(hContact, szModule, szSetting, dbv);
+	return db_get_s(hContact, szModule, szSetting, dbv, 0);
 }
 
-
 TCHAR* DBGetContactSettingStringT(HANDLE hContact, const char *szModule, const char* szSetting, TCHAR* szDef)
 {
 	DBVARIANT dbv = {DBVT_DELETED};
-- 
cgit v1.2.3