From 32dedc767dec565c576b78b786e7a95d76ac806e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 19 Nov 2012 12:51:53 +0000 Subject: - added another helper, ExtraIcon_Clear, to remove an icon from slot; - added ability to pass IcoLib handles instead of icons' names git-svn-id: http://svn.miranda-ng.org/main/trunk@2371 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/utils/openurl.cpp | 2 +- src/modules/utils/path.cpp | 2 +- src/modules/utils/timezones.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/utils') diff --git a/src/modules/utils/openurl.cpp b/src/modules/utils/openurl.cpp index a50ee22e7e..ebf462cca4 100644 --- a/src/modules/utils/openurl.cpp +++ b/src/modules/utils/openurl.cpp @@ -57,7 +57,7 @@ static void OpenURLThread(void *arg) DBVARIANT dbv; if (!DBGetContactSettingTString(NULL, "Miranda", "OpenUrlBrowser", &dbv)) { ShellExecute(NULL, _T("open"), dbv.ptszVal, szResult, NULL, (hUrlInfo->newWindow) ? SW_NORMAL : SW_SHOWDEFAULT); - DBFreeVariant(&dbv); + db_free(&dbv); } else ShellExecute(NULL, _T("open"), szResult, NULL, NULL, (hUrlInfo->newWindow) ? SW_NORMAL : SW_SHOWDEFAULT); diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp index 9d2f543e4a..24e30fcf4a 100644 --- a/src/modules/utils/path.cpp +++ b/src/modules/utils/path.cpp @@ -71,7 +71,7 @@ TCHAR *GetContactID(HANDLE hContact) DBVARIANT dbv; if ( !DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv)) { theValue = (TCHAR *)mir_tstrdup(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return theValue; } } else { diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index 2f7153442b..a230fa7083 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -190,7 +190,7 @@ static HANDLE timeapiGetInfoByContact(HANDLE hContact, DWORD dwFlags) if ( !DBGetContactSettingTString(hContact, "UserInfo", "TzName", &dbv)) { HANDLE res = timeapiGetInfoByName(dbv.ptszVal, dwFlags); - DBFreeVariant(&dbv); + db_free(&dbv); if (res) return res; } @@ -201,7 +201,7 @@ static HANDLE timeapiGetInfoByContact(HANDLE hContact, DWORD dwFlags) if ( !DBGetContactSettingTString(hContact, szProto, "TzName", &dbv)) { HANDLE res = timeapiGetInfoByName(dbv.ptszVal, dwFlags); - DBFreeVariant(&dbv); + db_free(&dbv); if (res) return res; } timezone = (signed char)db_get_b(hContact, szProto, "Timezone", -1); @@ -390,7 +390,7 @@ static int timeapiSelectListItem(HANDLE hContact, HWND hWnd, DWORD dwFlags) break; } } - DBFreeVariant(&dbv); + db_free(&dbv); } } -- cgit v1.2.3