- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

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

2 files changed, 15 insertions, 15 deletions

diff --git a/src/modules/srauth/auth.cpp b/src/modules/srauth/auth.cpp
index 4b0c02cca6..44fca593c4 100644
--- a/src/modules/srauth/auth.cpp
+++ b/src/modules/srauth/auth.cpp
@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful,

+This program is distributed in the hope that it will be useful, 

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -30,14 +30,14 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 

 INT_PTR ShowReqWindow(WPARAM, LPARAM lParam)

 {

-	CreateDialogParam(hMirandaInst, MAKEINTRESOURCE(IDD_AUTHREQ), NULL, DlgProcAuthReq,

+	CreateDialogParam(hMirandaInst, MAKEINTRESOURCE(IDD_AUTHREQ), NULL, DlgProcAuthReq, 

 		(LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

 	return 0;

 }

 

 INT_PTR ShowAddedWindow(WPARAM, LPARAM lParam)

 {

-	CreateDialogParam(hMirandaInst, MAKEINTRESOURCE(IDD_ADDED), NULL, DlgProcAdded,

+	CreateDialogParam(hMirandaInst, MAKEINTRESOURCE(IDD_ADDED), NULL, DlgProcAdded, 

 		(LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

 	return 0;

 }

@@ -50,7 +50,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 

 	DBEVENTINFO dbei = {0};

 	dbei.cbSize = sizeof(dbei);

-	CallService(MS_DB_EVENT_GET,(WPARAM)lParam,(LPARAM)&dbei);

+	CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&dbei);

 	if (dbei.flags & (DBEF_SENT | DBEF_READ) || 

 		(dbei.eventType != EVENTTYPE_AUTHREQUEST && dbei.eventType != EVENTTYPE_ADDED)) 

 		return 0;

diff --git a/src/modules/srauth/authdialogs.cpp b/src/modules/srauth/authdialogs.cpp
index 367c8790ac..8d3e90a836 100644
--- a/src/modules/srauth/authdialogs.cpp
+++ b/src/modules/srauth/authdialogs.cpp
@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful,

+This program is distributed in the hope that it will be useful, 

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -41,7 +41,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			//blob is: uin(DWORD), hcontact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)

 			DBEVENTINFO dbei = {0};

 			dbei.cbSize = sizeof(dbei);

-			dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE,(WPARAM)hDbEvent,0);

+			dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0);

 			dbei.pBlob  = (PBYTE)alloca(dbei.cbBlob);

 			CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbei);

 

@@ -115,7 +115,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 

 				HANDLE hContact = (HANDLE)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

                 if ((hContact == INVALID_HANDLE_VALUE) || !DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

-                    ShowWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE);

+                    ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 				break;

 			}

 			case IDC_DETAILS:

@@ -141,8 +141,8 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		break;

 

 	case WM_DESTROY:

-		Button_FreeIcon_IcoLib(hwndDlg,IDC_ADD);

-		Button_FreeIcon_IcoLib(hwndDlg,IDC_DETAILS);

+		Button_FreeIcon_IcoLib(hwndDlg, IDC_ADD);

+		Button_FreeIcon_IcoLib(hwndDlg, IDC_DETAILS);

 		DestroyIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));

 		DestroyIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));

 		break;

@@ -164,13 +164,13 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		{

 			DBEVENTINFO dbei = {0};

 			DWORD uin;

-			char *nick,*first,*last,*email,*reason;

+			char *nick, *first, *last, *email, *reason;

 			HANDLE hContact;		

 			

 			hDbEvent = (HANDLE)lParam;

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

-			//blob is: uin(DWORD),hcontact(HANDLE),nick(ASCIIZ),first(ASCIIZ),last(ASCIIZ),email(ASCIIZ),reason(ASCIIZ)

+			//blob is: uin(DWORD), hcontact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ), reason(ASCIIZ)

 			dbei.cbSize = sizeof(dbei);

 			dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0);

 			dbei.pBlob  = (PBYTE)alloca(dbei.cbBlob);

@@ -234,7 +234,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 

 			SendDlgItemMessage(hwndDlg, IDC_DENYREASON, EM_LIMITTEXT, 255, 0);

-			if (CallProtoService(dbei.szModule, PS_GETCAPS,PFLAGNUM_4, 0) & PF4_NOAUTHDENYREASON)

+			if (CallProtoService(dbei.szModule, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_NOAUTHDENYREASON)

 			{

 				EnableWindow(GetDlgItem(hwndDlg, IDC_DENYREASON), FALSE);

 				SetDlgItemText(hwndDlg, IDC_DENYREASON, TranslateT("Feature is not supported by protocol"));

@@ -267,7 +267,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				DBEVENTINFO dbei = {0};

 				dbei.cbSize = sizeof(dbei);

 				CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbei);

-				CallProtoService(dbei.szModule, PS_AUTHALLOW, (WPARAM)hDbEvent,0);

+				CallProtoService(dbei.szModule, PS_AUTHALLOW, (WPARAM)hDbEvent, 0);

 

 				if (IsDlgButtonChecked(hwndDlg, IDC_ADDCHECK))

 				{

@@ -302,8 +302,8 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		break;

 

 	case WM_DESTROY:

-		Button_FreeIcon_IcoLib(hwndDlg,IDC_ADD);

-		Button_FreeIcon_IcoLib(hwndDlg,IDC_DETAILS);

+		Button_FreeIcon_IcoLib(hwndDlg, IDC_ADD);

+		Button_FreeIcon_IcoLib(hwndDlg, IDC_DETAILS);

 		DestroyIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));

 		DestroyIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));

 		break;