minor options layout issue (ticket:152)

git-svn-id: http://svn.miranda-ng.org/main/trunk@2173 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 17 insertions, 17 deletions

diff --git a/plugins/StopSpamPlus/src/headers.h b/plugins/StopSpamPlus/src/headers.h
index 6da161f793..5675319390 100644
--- a/plugins/StopSpamPlus/src/headers.h
+++ b/plugins/StopSpamPlus/src/headers.h
@@ -35,7 +35,7 @@
 

 #define pluginName "StopSpam"

 

-extern char * pluginDescription;

+extern TCHAR * pluginDescription;

 extern TCHAR const * infTalkProtPrefix;

 extern char const * answeredSetting;

 extern char const * questCountSetting;

diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp
index f823fe8e1d..505e0dc801 100644
--- a/plugins/StopSpamPlus/src/options.cpp
+++ b/plugins/StopSpamPlus/src/options.cpp
@@ -1,12 +1,12 @@
 #include "headers.h"

 

-char * pluginDescription = "No more spam! Robots can't go! Only human beings invited!\r\n\r\n"

-"This plugin works pretty simple:\r\n"

-"While messages from users on your contact list go as there is no any anti-spam software, "

-"messages from unknown users are not delivered to you. "

-"But also they are not ignored, this plugin replies with a simple question, "

-"and if user gives the right answer plugin adds him to your contact list "

-"so that he can contact you.";

+TCHAR * pluginDescription = _T("No more spam! Robots can't go! Only human beings invited!\r\n\r\n")

+_T("This plugin works pretty simple:\r\n")

+_T("While messages from users on your contact list go as there is no any anti-spam software, ")

+_T("messages from unknown users are not delivered to you. ")

+_T("But also they are not ignored, this plugin replies with a simple question, ")

+_T("and if user gives the right answer plugin adds him to your contact list ")

+_T("so that he can contact you.");

 TCHAR const * infTalkProtPrefix = _T("StopSpam automatic message:\r\n");

 char const * answeredSetting = "Answered";

 char const * questCountSetting = "QuestionCount";

@@ -18,7 +18,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	{

 	case WM_INITDIALOG:

 		{

-			SetDlgItemTextA(hwnd, ID_DESCRIPTION, pluginDescription);

+			SetDlgItemText(hwnd, ID_DESCRIPTION, pluginDescription);

 			TranslateDialogDefault(hwnd);

 			SetDlgItemInt(hwnd, ID_MAXQUESTCOUNT, plSets->MaxQuestCount.Get(), FALSE);

 			SendDlgItemMessage(hwnd, ID_INFTALKPROT, BM_SETCHECK, plSets->InfTalkProtection.Get() ? BST_CHECKED : BST_UNCHECKED, 0);

diff --git a/plugins/StopSpamPlus/src/resource.h b/plugins/StopSpamPlus/src/resource.h
index 62e603cb2e..5a61c2abcd 100644
--- a/plugins/StopSpamPlus/src/resource.h
+++ b/plugins/StopSpamPlus/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by stopspam.rc

+// Used by C:\Users\xx\Documents\Visual Studio 2010\Projects\myranda\plugins\StopSpamPlus\res\stopspam.rc

 //

 #define IDD_MESSAGES                    101

 #define IDD_MAIN                        102

@@ -16,11 +16,12 @@
 #define ID_INFTALKPROT                  1010

 #define ID_ADDPERMANENT                 1011

 #define ID_HANDLEAUTHREQ                1012

-#define ID_NOTCASESENS					1013

-#define ID_DIVIDER						1014

+#define ID_NOTCASESENS                  1013

+#define ID_DIVIDER                      1014

 #define IDC_VARS                        1015

-#define ID_REMOVE_TMP_ALL				1016

-#define ID_HISTORY_LOG					1017

+#define ID_REMOVE_TMP_ALL               1016

+#define ID_HISTORY_LOG                  1017

+

 // Next default values for new objects

 // 

 #ifdef APSTUDIO_INVOKED

diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp
index e58b8846ff..42639424fd 100644
--- a/plugins/StopSpamPlus/src/stopspam.cpp
+++ b/plugins/StopSpamPlus/src/stopspam.cpp
@@ -60,7 +60,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	mi.position = -0x7FFFFFFF;

 	mi.flags = CMIF_TCHAR;

 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	mi.ptszName = _T("Remove Temporary Contacts");

+	mi.ptszName = LPGENT("Remove Temporary Contacts");

 	mi.pszService = pluginName"/RemoveTempContacts";

 	Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp
index 7d8bc28050..885af411ad 100644
--- a/plugins/StopSpamPlus/src/utils.cpp
+++ b/plugins/StopSpamPlus/src/utils.cpp
@@ -46,7 +46,6 @@ void SetDlgItemString(HWND hwndDlg, UINT idItem, std::wstring const &str)
 tstring variables_parse(tstring const &tstrFormat, HANDLE hContact){

 	if (ServiceExists(MS_VARS_FORMATSTRING)) {

 		FORMATINFO fi;

-		TCHAR *tszParsed;

 		tstring tstrResult;

 

 		ZeroMemory(&fi, sizeof(fi));

@@ -54,7 +53,7 @@ tstring variables_parse(tstring const &tstrFormat, HANDLE hContact){
 		fi.tszFormat = _tcsdup(tstrFormat.c_str());

 		fi.hContact = hContact;

 		fi.flags |= FIF_TCHAR;

-		tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

+		TCHAR *tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

 		free(fi.tszFormat);

 		if (tszParsed) {

 			tstrResult = tszParsed;