From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/import.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'protocols/Gadu-Gadu/src/import.cpp')

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;
 
-- 
cgit v1.2.3