diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-03 20:11:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-03 20:11:26 +0000 |
| commit | e84b97a0622a26fe474ccd840dcadb320520601c (patch) | |
| tree | 7c1725e6eddbb47d618c8574147dd998feb8ea52 /plugins/Import | |
| parent | e82c4d5d574191f432716049218b4b7b5162ec38 (diff) | |
- new helpers for reading db strings into static buffers;
- MS_DB_CONTACT_GETSETTINGSTATIC died;
- DBCONTACTGETSETTING is detouched from all services;
- these service calls are rewritten using parameters
git-svn-id: http://svn.miranda-ng.org/main/trunk@8035 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Import')
| -rw-r--r-- | plugins/Import/src/import.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index f220b3b6bc..7d15029661 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -34,23 +34,20 @@ static MIDatabase *srcDb, *dstDb; static int myGet(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)
{
dbv->type = 0;
- DBCONTACTGETSETTING dgs = { szModule, szSetting, dbv };
- return srcDb->GetContactSetting(hContact, &dgs);
+ return srcDb->GetContactSetting(hContact, szModule, szSetting, dbv);
}
static TCHAR* myGetWs(HANDLE hContact, const char *szModule, const char *szSetting)
{
DBVARIANT dbv = { DBVT_TCHAR };
- DBCONTACTGETSETTING dgs = { szModule, szSetting, &dbv };
- return ( srcDb->GetContactSettingStr(hContact, &dgs)) ? NULL : dbv.ptszVal;
+ return srcDb->GetContactSettingStr(hContact, szModule, szSetting, &dbv) ? NULL : dbv.ptszVal;
}
static BOOL myGetS(HANDLE hContact, const char *szModule, const char *szSetting, char* dest)
{
DBVARIANT dbv = { DBVT_ASCIIZ };
dbv.pszVal = dest; dbv.cchVal = 100;
- DBCONTACTGETSETTING dgs = { szModule, szSetting, &dbv };
- return srcDb->GetContactSettingStatic(hContact, &dgs);
+ return srcDb->GetContactSettingStatic(hContact, szModule, szSetting, &dbv);
}
static void mySet(HANDLE hContact, const char *module, const char *var, DBVARIANT *dbv)
|