Google contact removed from clist

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

1 files changed, 6 insertions, 19 deletions

diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp
index 792bc9f45c..7df8c2c7d3 100644
--- a/protocols/GTalkExt/src/options.cpp
+++ b/protocols/GTalkExt/src/options.cpp
@@ -47,17 +47,12 @@ void CheckControlsEnabled(HWND wnd)
 	BOOL PopupsEnabled = (SendMessage(GetDlgItem(wnd, IDC_POPUPSENABLED), BM_GETSTATE, 0, 0) & BST_CHECKED) == BST_CHECKED;

 	EnableWindow(GetDlgItem(wnd, IDC_POPUPSINFULLSCREEN), PopupsEnabled);

 	EnableWindow(GetDlgItem(wnd, IDC_POPUPSINFULLSCREENLABEL), PopupsEnabled);

+	EnableWindow(GetDlgItem(wnd, IDC_ADDSNIP), PopupsEnabled);

 

-	BOOL CListEnabled = (SendMessage(GetDlgItem(wnd, IDC_PSEUDOCONTACTENABLED), BM_GETSTATE, 0, 0) & BST_CHECKED) == BST_CHECKED;

-	EnableWindow(GetDlgItem(wnd, IDC_CLEARPSEUDOCONTACTLOG), CListEnabled);

-

-	EnableWindow(GetDlgItem(wnd, IDC_MARKEVENTREAD), PopupsEnabled && CListEnabled);

-	EnableWindow(GetDlgItem(wnd, IDC_ADDSNIP), PopupsEnabled || CListEnabled);

-

-	EnableWindow(GetDlgItem(wnd, IDC_MAILBOXVIEWLABEL), PopupsEnabled || CListEnabled);

-	EnableWindow(GetDlgItem(wnd, IDC_UNKNOWNVIEW), PopupsEnabled || CListEnabled);

-	EnableWindow(GetDlgItem(wnd, IDC_STANDARDVIEW), PopupsEnabled || CListEnabled);

-	EnableWindow(GetDlgItem(wnd, IDC_HTMLVIEW), PopupsEnabled || CListEnabled);

+	EnableWindow(GetDlgItem(wnd, IDC_MAILBOXVIEWLABEL), PopupsEnabled);

+	EnableWindow(GetDlgItem(wnd, IDC_UNKNOWNVIEW), PopupsEnabled);

+	EnableWindow(GetDlgItem(wnd, IDC_STANDARDVIEW), PopupsEnabled);

+	EnableWindow(GetDlgItem(wnd, IDC_HTMLVIEW), PopupsEnabled);

 }

 

 BOOL ReadCheckbox(HWND wnd, int id, DWORD controls)

@@ -72,10 +67,7 @@ DWORD ReadCheckboxes(HWND wnd, LPCSTR mod)
 {

 	DWORD controls = DBGetContactSettingDword(0, NOTIFY_SETTINGS_FROM_MOD_NAME, mod, 0);

 	ReadCheckbox(wnd, IDC_POPUPSENABLED, controls);

-	ReadCheckbox(wnd, IDC_PSEUDOCONTACTENABLED, controls);

-	ReadCheckbox(wnd, IDC_CLEARPSEUDOCONTACTLOG, controls);

 	ReadCheckbox(wnd, IDC_POPUPSINFULLSCREEN, controls);

-	ReadCheckbox(wnd, IDC_MARKEVENTREAD, controls);

 	ReadCheckbox(wnd, IDC_AUTHONMAILBOX, controls);

 	ReadCheckbox(wnd, IDC_ADDSNIP, controls);

 	ReadCheckbox(wnd, IDC_UNKNOWNVIEW, controls);

@@ -93,11 +85,9 @@ DWORD GetCheckboxSaveValue(HWND wnd, int id)
 

 void SaveControls(HWND wnd, LPCSTR mod)

 {

-	DWORD controls = GetCheckboxSaveValue(wnd, IDC_CLEARPSEUDOCONTACTLOG) |

+	DWORD controls = 

 		GetCheckboxSaveValue(wnd, IDC_POPUPSINFULLSCREEN) |

 		GetCheckboxSaveValue(wnd, IDC_POPUPSENABLED) |

-		GetCheckboxSaveValue(wnd, IDC_PSEUDOCONTACTENABLED) |

-		GetCheckboxSaveValue(wnd, IDC_MARKEVENTREAD) |

 		GetCheckboxSaveValue(wnd, IDC_AUTHONMAILBOX) |

 		GetCheckboxSaveValue(wnd, IDC_ADDSNIP) |

 		GetCheckboxSaveValue(wnd, IDC_UNKNOWNVIEW) |

@@ -125,13 +115,10 @@ INT_PTR CALLBACK AccOptionsDlgProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lPa
 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

 		case IDC_POPUPSENABLED:

-		case IDC_PSEUDOCONTACTENABLED:

 			if (HIWORD(wParam) == BN_CLICKED) CheckControlsEnabled(wnd);

 			// no break

 

-		case IDC_CLEARPSEUDOCONTACTLOG:

 		case IDC_POPUPSINFULLSCREEN:

-		case IDC_MARKEVENTREAD:

 		case IDC_AUTHONMAILBOX:

 		case IDC_ADDSNIP:

 		case IDC_UNKNOWNVIEW: