From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- protocols/Gadu-Gadu/src/avatar.cpp | 2 +- protocols/Gadu-Gadu/src/core.cpp | 22 +++++++++++----------- protocols/Gadu-Gadu/src/dialogs.cpp | 24 ++++++++++++------------ protocols/Gadu-Gadu/src/gg_proto.cpp | 2 +- protocols/Gadu-Gadu/src/groupchat.cpp | 4 ++-- protocols/Gadu-Gadu/src/import.cpp | 26 +++++++++++++------------- protocols/Gadu-Gadu/src/oauth.cpp | 12 ++++++------ protocols/Gadu-Gadu/src/services.cpp | 10 +++++----- protocols/Gadu-Gadu/src/userutils.cpp | 2 +- 9 files changed, 52 insertions(+), 52 deletions(-) (limited to 'protocols/Gadu-Gadu') diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index f3d2b87807..674a2e37ed 100644 --- a/protocols/Gadu-Gadu/src/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp @@ -63,7 +63,7 @@ void GGPROTO::getAvatarFilename(HANDLE hContact, TCHAR *pszDest, int cbLen) TCHAR* avatarHashT = mir_a2t(dbv.pszVal); mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s.%s"), avatarHashT, avatartype); mir_free(avatarHashT); - DBFreeVariant(&dbv); + db_free(&dbv); } } else { mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s avatar.%s"), m_tszUserName, avatartype); diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index 7fb2b52aea..6d3b91fe28 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -72,7 +72,7 @@ void GGPROTO::disconnect() if (!szMsg && !db_get_s(NULL, "SRAway", gg_status2db(ID_STATUS_ONLINE, "Default"), &dbv, DBVT_TCHAR)) { if (dbv.ptszVal && *(dbv.ptszVal)) szMsg = mir_utf8encodeT(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; case ID_STATUS_AWAY: @@ -82,7 +82,7 @@ void GGPROTO::disconnect() if (!szMsg && !db_get_s(NULL, "SRAway", gg_status2db(ID_STATUS_AWAY, "Default"), &dbv, DBVT_TCHAR)) { if (dbv.ptszVal && *(dbv.ptszVal)) szMsg = mir_utf8encodeT(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; case ID_STATUS_DND: @@ -92,7 +92,7 @@ void GGPROTO::disconnect() if (!szMsg && !db_get_s(NULL, "SRAway", gg_status2db(ID_STATUS_DND, "Default"), &dbv, DBVT_TCHAR)) { if (dbv.ptszVal && *(dbv.ptszVal)) szMsg = mir_utf8encodeT(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; case ID_STATUS_FREECHAT: @@ -102,7 +102,7 @@ void GGPROTO::disconnect() if (!szMsg && !db_get_s(NULL, "SRAway", gg_status2db(ID_STATUS_FREECHAT, "Default"), &dbv, DBVT_TCHAR)) { if (dbv.ptszVal && *(dbv.ptszVal)) szMsg = mir_utf8encodeT(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; case ID_STATUS_INVISIBLE: @@ -112,7 +112,7 @@ void GGPROTO::disconnect() if (!szMsg && !db_get_s(NULL, "SRAway", gg_status2db(ID_STATUS_INVISIBLE, "Default"), &dbv, DBVT_TCHAR)) { if (dbv.ptszVal && *(dbv.ptszVal)) szMsg = mir_utf8encodeT(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; default: @@ -311,7 +311,7 @@ void __cdecl GGPROTO::mainthread(void *) if (!db_get_s(NULL, m_szModuleName, GG_KEY_SERVERHOSTS, &dbv, DBVT_ASCIIZ)) { hostcount = gg_decodehosts(dbv.pszVal, hosts, 64); - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -320,7 +320,7 @@ void __cdecl GGPROTO::mainthread(void *) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); p.password = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { @@ -381,7 +381,7 @@ void __cdecl GGPROTO::mainthread(void *) else netlog("mainthread() (%x): Loading forwarding host %s and port %d.", dbv.pszVal, p.external_port, this); if (p.external_addr) p.external_port = db_get_w(NULL, m_szModuleName, GG_KEY_FORWARDPORT, GG_KEYDEF_FORWARDPORT); - DBFreeVariant(&dbv); + db_free(&dbv); } } // Setup client port @@ -924,7 +924,7 @@ retry: TCHAR* nickT; if (!db_get_s(NULL, m_szModuleName, GG_KEY_NICK, &dbv, DBVT_TCHAR)){ nickT = mir_tstrdup(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { nickT = mir_tstrdup(TranslateT("Me")); } @@ -1325,7 +1325,7 @@ int GGPROTO::contactdeleted(WPARAM wParam, LPARAM lParam) CallServiceSync(MS_GC_EVENT, SESSION_TERMINATE, (LPARAM)&gcevent); } - DBFreeVariant(&dbv); + db_free(&dbv); return 0; } @@ -1402,7 +1402,7 @@ int GGPROTO::dbsettingchanged(WPARAM wParam, LPARAM lParam) CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gcevent); /* FIXME */ cascade = 0; } - DBFreeVariant(&dbv); + db_free(&dbv); } else { // Change contact name on all chats gc_changenick(hContact, ptszVal); diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index 97afdbcb89..3f8a29053c 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -145,7 +145,7 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, if (!unspecified) SetDlgItemText(hwndDlg, idCtrl, ptstr); } - DBFreeVariant(&dbv); + db_free(&dbv); } //////////////////////////////////////////////////////////////////////////////// @@ -193,7 +193,7 @@ void GGPROTO::checknewuser(uin_t uin, const char* passwd) if (!db_get_s(NULL, m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { if (dbv.pszVal) strcpy(oldpasswd, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (uin > 0 && strlen(passwd) > 0 && (uin != olduin || strcmp(oldpasswd, passwd))) @@ -256,11 +256,11 @@ static INT_PTR CALLBACK gg_genoptsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_EMAIL, &dbv, DBVT_ASCIIZ)) { SetDlgItemTextA(hwndDlg, IDC_EMAIL, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { @@ -419,14 +419,14 @@ static INT_PTR CALLBACK gg_genoptsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemTextA(hwndDlg, IDC_PASSWORD, ""); // Update e-mail if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_EMAIL, &dbv, DBVT_ASCIIZ)) { SetDlgItemTextA(hwndDlg, IDC_EMAIL, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemTextA(hwndDlg, IDC_EMAIL, ""); @@ -618,7 +618,7 @@ static INT_PTR CALLBACK gg_advoptsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, TranslateDialogDefault(hwndDlg); if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_SERVERHOSTS, &dbv, DBVT_ASCIIZ)) { SetDlgItemTextA(hwndDlg, IDC_HOST, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemTextA(hwndDlg, IDC_HOST, GG_KEYDEF_SERVERHOSTS); @@ -638,7 +638,7 @@ static INT_PTR CALLBACK gg_advoptsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, CheckDlgButton(hwndDlg, IDC_FORWARDING, db_get_b(NULL, gg->m_szModuleName, GG_KEY_FORWARDING, GG_KEYDEF_FORWARDING)); if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_FORWARDHOST, &dbv, DBVT_ASCIIZ)) { SetDlgItemTextA(hwndDlg, IDC_FORWARDHOST, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (num = db_get_w(NULL, gg->m_szModuleName, GG_KEY_FORWARDPORT, GG_KEYDEF_FORWARDPORT)) SetDlgItemTextA(hwndDlg, IDC_FORWARDPORT, ditoa(num)); @@ -983,11 +983,11 @@ INT_PTR CALLBACK gg_acc_mgr_guidlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_EMAIL, &dbv, DBVT_ASCIIZ)) { SetDlgItemTextA(hwndDlg, IDC_EMAIL, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; } @@ -1026,14 +1026,14 @@ INT_PTR CALLBACK gg_acc_mgr_guidlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemTextA(hwndDlg, IDC_PASSWORD, ""); // Update e-mail if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_EMAIL, &dbv, DBVT_ASCIIZ)) { SetDlgItemTextA(hwndDlg, IDC_EMAIL, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemTextA(hwndDlg, IDC_EMAIL, ""); } diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 1c6caf192a..133c38469f 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -688,7 +688,7 @@ void __cdecl GGPROTO::getawaymsgthread(void *hContact) { ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE) 1, (LPARAM) dbv.ptszVal); netlog("getawaymsgthread(): Reading away msg <%S>.", dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE) 1, (LPARAM) NULL); } diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index a0768e238f..ff8e0bfccd 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -151,7 +151,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam) { if (dbv.ptszVal && !_tcscmp(gch->pDest->ptszID, dbv.ptszVal)) CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); - DBFreeVariant(&dbv); + db_free(&dbv); } hContact = db_find_next(hContact); } @@ -177,7 +177,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam) TCHAR* nickT; if (!db_get_s(NULL, m_szModuleName, GG_KEY_NICK, &dbv, DBVT_TCHAR)){ nickT = mir_tstrdup(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { nickT = mir_tstrdup(TranslateT("Me")); } diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index c0ee96e5e9..0cbded18f8 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -34,10 +34,10 @@ int GroupNameExists(const char *name) _itoa(i, idstr, 10); if (db_get_s(NULL, "CListGroups", idstr, &dbv, DBVT_ASCIIZ)) break; if (!strcmp(dbv.pszVal + 1, name)) { - DBFreeVariant(&dbv); + db_free(&dbv); return 1; } - DBFreeVariant(&dbv); + db_free(&dbv); } return 0; } @@ -86,7 +86,7 @@ char *CreateGroup(char *groupName) _itoa(groupId, groupIdStr,10); if (db_get_s(NULL, "CListGroups", groupIdStr, &dbv, DBVT_ASCIIZ)) break; - DBFreeVariant(&dbv); + db_free(&dbv); } groupName2[0] = 1|GROUPF_EXPANDED; // 1 is required so we never get '\0' @@ -115,7 +115,7 @@ char *gg_makecontacts(GGPROTO *gg, int cr) char* pszValA = mir_t2a(dbv.ptszVal); string_append(s, dbv.pszVal); mir_free(pszValA); - DBFreeVariant(&dbv); + db_free(&dbv); } string_append_c(s, ';'); // Readup LastName @@ -124,7 +124,7 @@ char *gg_makecontacts(GGPROTO *gg, int cr) char* pszValA = mir_t2a(dbv.ptszVal); string_append(s, dbv.pszVal); mir_free(pszValA); - DBFreeVariant(&dbv); + db_free(&dbv); } string_append_c(s, ';'); @@ -138,14 +138,14 @@ char *gg_makecontacts(GGPROTO *gg, int cr) char* pszValA = mir_t2a(dbv2.ptszVal); string_append(s, pszValA); mir_free(pszValA); - DBFreeVariant(&dbv2); + db_free(&dbv2); } else { string_append(s, dbvA); } string_append_c(s, ';'); string_append(s, dbvA); mir_free(dbvA); - DBFreeVariant(&dbv); + db_free(&dbv); } else string_append_c(s, ';'); @@ -159,14 +159,14 @@ char *gg_makecontacts(GGPROTO *gg, int cr) if (sms) *sms = 0; string_append(s, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } string_append_c(s, ';'); // Readup Group if (!db_get_s(hContact, "CList", "Group", &dbv, DBVT_ASCIIZ)) { string_append(s, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } string_append_c(s, ';'); // Readup Uin @@ -176,7 +176,7 @@ char *gg_makecontacts(GGPROTO *gg, int cr) if (!db_get_s(hContact, "UserInfo", "Mye-mail0", &dbv, DBVT_ASCIIZ)) { string_append(s, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (cr) string_append(s, ";0;;0;\r\n"); @@ -349,7 +349,7 @@ INT_PTR GGPROTO::import_server(WPARAM wParam, LPARAM lParam) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); password = _strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else return 0; @@ -396,7 +396,7 @@ INT_PTR GGPROTO::remove_server(WPARAM wParam, LPARAM lParam) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); password = _strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else return 0; @@ -577,7 +577,7 @@ INT_PTR GGPROTO::export_server(WPARAM wParam, LPARAM lParam) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); password = _strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else return 0; diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp index a7e5ebac80..6773b61cf6 100644 --- a/protocols/Gadu-Gadu/src/oauth.cpp +++ b/protocols/Gadu-Gadu/src/oauth.cpp @@ -365,16 +365,16 @@ char* GGPROTO::oauth_header(const char *httpmethod, const char *url) if (!db_get_s(NULL, m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, (WPARAM)(int)strlen(dbv.pszVal) + 1, (LPARAM)dbv.pszVal); password = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!db_get_s(NULL, m_szModuleName, GG_KEY_TOKEN, &dbv, DBVT_ASCIIZ)) { token = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!db_get_s(NULL, m_szModuleName, GG_KEY_TOKENSECRET, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, (WPARAM)(int)strlen(dbv.pszVal) + 1, (LPARAM)dbv.pszVal); token_secret = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } res = oauth_auth_header(httpmethod, url, HMACSHA1, uin, password, token, token_secret); @@ -399,7 +399,7 @@ int GGPROTO::oauth_receivetoken() if (!db_get_s(NULL, m_szModuleName, GG_KEY_PASSWORD, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM)dbv.pszVal); password = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } // 1. Obtaining an Unauthorized Request Token @@ -562,12 +562,12 @@ int GGPROTO::oauth_checktoken(int force) if (!db_get_s(NULL, m_szModuleName, GG_KEY_TOKEN, &dbv, DBVT_ASCIIZ)) { token = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!db_get_s(NULL, m_szModuleName, GG_KEY_TOKENSECRET, &dbv, DBVT_ASCIIZ)) { CallService(MS_DB_CRYPT_DECODESTRING, (WPARAM)(int)strlen(dbv.pszVal) + 1, (LPARAM)dbv.pszVal); token_secret = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (token == NULL || token_secret == NULL) { diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp index 09067b1ff0..93be5e73f3 100644 --- a/protocols/Gadu-Gadu/src/services.cpp +++ b/protocols/Gadu-Gadu/src/services.cpp @@ -233,10 +233,10 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam) netlog("getavatarinfo(): Incoming request for avatar information. Contact has assigned Locked ContactPhoto. return GAIR_SUCCESS"); _tcscpy_s(pai->filename, SIZEOF(pai->filename) ,dbv.ptszVal); pai->format = GetImageFormat(pai->filename); - DBFreeVariant(&dbv); + db_free(&dbv); return GAIR_SUCCESS; } else { - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -257,11 +257,11 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam) if (!db_get_s(pai->hContact, m_szModuleName, GG_KEY_AVATARURL, &dbv, DBVT_ASCIIZ)) { AvatarURL = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!db_get_s(pai->hContact, m_szModuleName, GG_KEY_AVATARTS, &dbv, DBVT_ASCIIZ)) { AvatarTs = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (AvatarURL != NULL && strlen(AvatarURL) > 0 && AvatarTs != NULL && strlen(AvatarTs) > 0) { char *AvatarName = strrchr(AvatarURL, '/'); @@ -273,7 +273,7 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam) if (!db_get_s(pai->hContact, m_szModuleName, GG_KEY_AVATARHASH, &dbv, DBVT_ASCIIZ)) { AvatarSavedHash = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (AvatarHash != NULL && AvatarSavedHash != NULL) { diff --git a/protocols/Gadu-Gadu/src/userutils.cpp b/protocols/Gadu-Gadu/src/userutils.cpp index e92188fe59..c00d615ad1 100644 --- a/protocols/Gadu-Gadu/src/userutils.cpp +++ b/protocols/Gadu-Gadu/src/userutils.cpp @@ -135,7 +135,7 @@ void *gg_dochpass(GGPROTO *gg, uin_t uin, char *password, char *newPass) if (!db_get_s(NULL, gg->m_szModuleName, GG_KEY_EMAIL, &dbv_email, DBVT_ASCIIZ)) { strncpy(email, dbv_email.pszVal, sizeof(email)); - DBFreeVariant(&dbv_email); + db_free(&dbv_email); } // Load token -- cgit v1.2.3