- 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

1 files changed, 11 insertions, 11 deletions

diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp
index 65ecf618e3..ec1717dfd5 100644
--- a/src/modules/clist/contacts.cpp
+++ b/src/modules/clist/contacts.cpp
@@ -62,7 +62,7 @@ static int ProcessDatabaseValueDefault(CONTACTINFO *ci, const char* setting)
 			ci->pszVal = dbv.ptszVal;

 			return 0;

 		}

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	if (DBGetContactSetting(ci->hContact, ci->szProto, setting, &dbv))

@@ -83,7 +83,7 @@ static int ProcessDatabaseValueDefault(CONTACTINFO *ci, const char* setting)
 		return 0;

 	}

 

-	DBFreeVariant(&dbv);

+	db_free(&dbv);

 	return 1;

 }

 

@@ -159,12 +159,12 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) {
 						else ci->pszVal = (TCHAR*)mir_strdup(countries[i].szName);

 

 						ci->type = CNFT_ASCIIZ;

-						DBFreeVariant(&dbv);

+						db_free(&dbv);

 						return 0;

 					}

 				}

 				else return ProcessDatabaseValueDefault(ci, (ci->dwFlag & 0x7F) == CNF_COUNTRY ? "Country" : "CompanyCountry");

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 			}

 			break;

 

@@ -187,11 +187,11 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) {
 							strcat(strcat(strcpy(buf, dbv.pszVal), " "), dbv2.pszVal);

 						ci->pszVal = (TCHAR*)buf;

 					}

-					DBFreeVariant(&dbv);

-					DBFreeVariant(&dbv2);

+					db_free(&dbv);

+					db_free(&dbv2);

 					return 0;

 				}

-				DBFreeVariant(&dbv);

+				db_free(&dbv);

 			}

 			break;

 

@@ -305,11 +305,11 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) {
 									ci->pszVal = (TCHAR*)buf;

 								}

 

-								DBFreeVariant(&dbv);

-								DBFreeVariant(&dbv2);

+								db_free(&dbv);

+								db_free(&dbv2);

 								return 0;

 							}

-							DBFreeVariant(&dbv);

+							db_free(&dbv);

 						}

 						break;

 

@@ -510,7 +510,7 @@ int LoadContactsModule(void)
 	DBVARIANT dbv;

 	if ( !DBGetContactSetting(NULL, "Contact", "NameOrder", &dbv)) {

 		CopyMemory(nameOrder, dbv.pbVal, dbv.cpbVal);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 

 	CreateServiceFunction(MS_CONTACT_GETCONTACTINFO, GetContactInfo);