3 files changed, 4 insertions, 23 deletions
diff --git a/protocols/YAMN/browser/mailbrowser.cpp b/protocols/YAMN/browser/mailbrowser.cpp
index 82f4d7eac0..02766e983c 100644
--- a/protocols/YAMN/browser/mailbrowser.cpp
+++ b/protocols/YAMN/browser/mailbrowser.cpp
@@ -405,7 +405,7 @@ int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags)
 
 	if ( (nflags & YAMN_ACC_POP) && 
 		(ActualAccount->Flags & YAMN_ACC_POPN) &&
-		(MN.Real.PopUpNC+MN.Virtual.PopUpNC) )		//if some popups with mails are needed to show
+		(MN.Real.PopUpNC+MN.Virtual.PopUpNC))		//if some popups with mails are needed to show
 			RunPopUps=TRUE;
 	else	RunPopUps=FALSE;
 
diff --git a/protocols/YAMN/main.cpp b/protocols/YAMN/main.cpp
index 184fe0e3e1..e876465609 100644
--- a/protocols/YAMN/main.cpp
+++ b/protocols/YAMN/main.cpp
@@ -54,22 +54,6 @@ PLUGININFOEX pluginInfo = {
 
 };
 
-SKINSOUNDDESC NewMailSound  = 
-{
-	sizeof(SKINSOUNDDESC), 
-	YAMN_NEWMAILSOUND, 	//name to refer to sound when playing and in db
-	YAMN_NEWMAILSNDDESC, 	//description for options dialog
-	"", 	   		//default sound file to use, without path
-};
-
-SKINSOUNDDESC ConnectFailureSound  = 
-{
-	sizeof(SKINSOUNDDESC), 
-	YAMN_CONNECTFAILSOUND, 	//name to refer to sound when playing and in db
-	YAMN_CONNECTFAILSNDDESC, //description for options dialog
-	"", 	   		//default sound file to use, without path
-};
-
 HANDLE hNewMailHook;
 HANDLE NoWriterEV;
 HANDLE hTTButton, hTButton;
@@ -468,9 +452,6 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	if (NULL == (ExitEV = CreateEvent(NULL, TRUE, FALSE, NULL)))
 		return 1;
 
-	NewMailSound.pszDescription = Translate(YAMN_NEWMAILSNDDESC);
-	ConnectFailureSound.pszDescription = Translate(YAMN_CONNECTFAILSNDDESC);
-
 	PosX = DBGetContactSettingDword(NULL, YAMN_DBMODULE, YAMN_DBPOSX, 0);
 	PosY = DBGetContactSettingDword(NULL, YAMN_DBMODULE, YAMN_DBPOSY, 0);
 	SizeX = DBGetContactSettingDword(NULL, YAMN_DBMODULE, YAMN_DBSIZEX, 800);
@@ -498,8 +479,8 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 
 	CreateServiceFunctions();
 
-	CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&NewMailSound);
-	CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ConnectFailureSound);
+	SkinAddNewSoundEx(YAMN_NEWMAILSOUND, YAMN_DBMODULE, YAMN_NEWMAILSNDDESC);
+	SkinAddNewSoundEx(YAMN_CONNECTFAILSOUND, YAMN_DBMODULE, YAMN_CONNECTFAILSNDDESC);
 
 	HookEvents();
 
diff --git a/protocols/YAMN/proto/pop3/pop3comm.cpp b/protocols/YAMN/proto/pop3/pop3comm.cpp
index dcd38ee2c8..f3120096bf 100644
--- a/protocols/YAMN/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/proto/pop3/pop3comm.cpp
@@ -590,7 +590,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 		DebugLog(CommFile,"<--------Communication-------->\n");
 		#endif
 		//	if we are already connected, we have open session (another thread left us open session), so we don't need to login
-		//	note that connected state without logging cannot occur, because if we close session, we always close socket too (we must close socket is the right word :) )
+		//	note that connected state without logging cannot occur, because if we close session, we always close socket too (we must close socket is the right word :))
 		if ((MyClient->NetClient==NULL) || !MyClient->NetClient->Connected())
 		{
 			SetAccountStatus(ActualAccount,TranslateT("Connecting to server"));