diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-05 22:27:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-05 22:27:16 +0000 |
| commit | 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 (patch) | |
| tree | b1ee30b70c6e36d1a06aed6885cb80dc560a68ca /plugins/Variables/src/contact.cpp | |
| parent | f4a1bbc6ba4b8137cb868639ac146aa97e97e9df (diff) | |
- 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
Diffstat (limited to 'plugins/Variables/src/contact.cpp')
| -rw-r--r-- | plugins/Variables/src/contact.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index f83653836e..c281d02ed3 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -143,7 +143,7 @@ TCHAR* getContactInfoT(BYTE type, HANDLE hContact) case CCNF_STATUS:
szStatus = (TCHAR*)CallService(
MS_CLIST_GETSTATUSMODEDESCRIPTION,
- (WPARAM)DBGetContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE),
+ (WPARAM)db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE),
(LPARAM)GSMDF_UNICODE);
if (szStatus == NULL)
return NULL;
@@ -152,7 +152,7 @@ TCHAR* getContactInfoT(BYTE type, HANDLE hContact) case CCNF_INTERNALIP:
case CCNF_EXTERNALIP:
{
- DWORD ip = DBGetContactSettingDword(hContact, szProto, (type == CCNF_INTERNALIP) ? "RealIP" : "IP", 0);
+ DWORD ip = db_get_dw(hContact, szProto, (type == CCNF_INTERNALIP) ? "RealIP" : "IP", 0);
if (ip == 0)
return NULL;
@@ -165,23 +165,23 @@ TCHAR* getContactInfoT(BYTE type, HANDLE hContact) }
case CCNF_GROUP:
- if (!DBGetContactSettingTString(hContact, "CList", "Group", &dbv))
+ if (!db_get_ts(hContact, "CList", "Group", &dbv))
{
res = (TCHAR*)mir_wstrdup(dbv.pwszVal);
- DBFreeVariant(&dbv);
+ db_free(&dbv);
return res;
}
break;
case CNF_UNIQUEID:
//UID for ChatRoom
- if (DBGetContactSettingByte(hContact, szProto, "ChatRoom", 0) == 1)
+ if (db_get_b(hContact, szProto, "ChatRoom", 0) == 1)
{
DBVARIANT dbv;
- if (!DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv ))
+ if (!db_get_ts(hContact, szProto, "ChatRoomID", &dbv ))
{
res = mir_tstrdup( dbv.ptszVal );
- DBFreeVariant( &dbv );
+ db_free( &dbv );
return res;
}
|