- 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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index 37b01b0e40..b4e69eb602 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -369,7 +369,7 @@ static void convertOneProtocol(char *moduleName, char *iconName)
 			_itoa(i, pi, 10);

 

 			db_set_ts(NULL, "SkinIcons", iconName, dbv.ptszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 

 			DBDeleteContactSetting(NULL, "Icons", moduleName);

 }	}	}

@@ -414,7 +414,7 @@ int LoadSkinIcons(void)
 		mir_snprintf(iconName, SIZEOF(iconName), "%s%d", mainIconsFmt, i);

 

 		db_set_ts(NULL, "SkinIcons", iconName, dbv.ptszVal);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 

 		DBDeleteContactSetting(NULL, "Icons", moduleName);

 	}

@@ -435,7 +435,7 @@ int LoadSkinIcons(void)
 		mir_snprintf(iconName, SIZEOF(iconName), "%s" TCHAR_STR_PARAM, statusIconsFmt, dbv.ptszVal);

 

 		convertOneProtocol(moduleName, iconName);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 	}

 	moduleName[0] = 0;

 	strcpy(iconName, "core_status_" GLOBAL_PROTO_NAME);

diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp
index 42e51898ed..ebf2be6f80 100644
--- a/src/modules/skin/sounds.cpp
+++ b/src/modules/skin/sounds.cpp
@@ -96,7 +96,7 @@ static INT_PTR ServiceSkinAddNewSound(WPARAM wParam, LPARAM lParam)
 		if (DBGetContactSettingString(NULL, "SkinSounds", item->name, &dbv))

 			db_set_ts(NULL, "SkinSounds", item->name, ptszDefaultFile);

 		else

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		mir_free(ptszDefaultFile);

 	}

 

@@ -129,7 +129,7 @@ static INT_PTR ServiceSkinPlaySound(WPARAM, LPARAM lParam)
 			TCHAR szFull[MAX_PATH];

 			PathToAbsoluteT(dbv.ptszVal, szFull, NULL);

 			NotifyEventHooks(hPlayEvent, 0, (LPARAM)szFull);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 	}

 	return 1;

@@ -253,7 +253,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 					TCHAR szPathFull[MAX_PATH];

 					PathToAbsoluteT(dbv.ptszVal, szPathFull, NULL);

 					NotifyEventHooks(hPlayEvent, 1, (LPARAM)szPathFull);

-					DBFreeVariant(&dbv);

+					db_free(&dbv);

 				}

 			}

 			break;

@@ -282,7 +282,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 					DBVARIANT dbv;

 					if (DBGetContactSettingTString(NULL, "SkinSounds", snd.name, &dbv) == 0) {

 						PathToAbsoluteT(dbv.ptszVal, strdir, NULL);

-						DBFreeVariant(&dbv);

+						db_free(&dbv);

 			}	}	}

 

 			mir_sntprintf(strFull, SIZEOF(strFull), _T("%s"), snd.ptszTempFile ? snd.ptszTempFile : _T(""));

@@ -381,7 +381,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 							DBVARIANT dbv;

 							if ( !DBGetContactSettingTString(NULL, "SkinSounds", arSounds[tvi.lParam].name, &dbv)) {

 								SetDlgItemText(hwndDlg, IDC_LOCATION, dbv.ptszVal);

-								DBFreeVariant(&dbv);

+								db_free(&dbv);

 							}

 							else SetDlgItemText(hwndDlg, IDC_LOCATION, TranslateT("<not specified>"));

 						}