code cleaning

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

1 files changed, 452 insertions, 458 deletions

diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp
index 219aad76c9..fbf31470ed 100644
--- a/plugins/SecureIM/src/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
@@ -9,13 +9,13 @@ BOOL hasKey(pUinKey ptr)
 {

 	BOOL ret = 0;

 	if (ptr->mode == MODE_NATIVE) {

-		LPSTR str = db_get_sa(ptr->hContact,MODULENAME,"PSK");

+		LPSTR str = db_get_sa(ptr->hContact, MODULENAME, "PSK");

 		ret = (str != NULL); SAFE_FREE(str);

 	}

 	else if (ptr->mode == MODE_RSAAES) {

 		DBVARIANT dbv;

 		dbv.type = DBVT_BLOB;

-		if (db_get(ptr->hContact,MODULENAME,"rsa_pub",&dbv) == 0) {

+		if (db_get(ptr->hContact, MODULENAME, "rsa_pub", &dbv) == 0) {

 			ret = 1;

 			db_free(&dbv);

 		}

@@ -46,7 +46,7 @@ int LV_InsertItem(HWND hwnd, LVITEM *lvi)
 

 int LV_InsertItemA(HWND hwnd, LVITEM *lvi)

 {

-	lvi->pszText = (LPSTR) mir_a2u(lvi->pszText);

+	lvi->pszText = (LPSTR)mir_a2u(lvi->pszText);

 	int ret = LV_InsertItem(hwnd, lvi);

 	mir_free(lvi->pszText);

 	return ret;

@@ -54,7 +54,7 @@ int LV_InsertItemA(HWND hwnd, LVITEM *lvi)
 

 void LV_SetItemText(HWND hwnd, WPARAM wparam, int subitem, LPSTR text)

 {

-	LV_ITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LV_ITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.iSubItem = subitem;

 	lvi.pszText = text;

 	SNDMSG(hwnd, LVM_SETITEMTEXTW, wparam, (LPARAM)&lvi);

@@ -62,14 +62,14 @@ void LV_SetItemText(HWND hwnd, WPARAM wparam, int subitem, LPSTR text)
 

 void LV_SetItemTextA(HWND hwnd, WPARAM wparam, int subitem, LPSTR text)

 {

-	text = (LPSTR) mir_a2u(text);

+	text = (LPSTR)mir_a2u(text);

 	LV_SetItemText(hwnd, wparam, subitem, text);

 	mir_free(text);

 }

 

 void LV_GetItemTextA(HWND hwnd, WPARAM wparam, int iSubItem, LPSTR text, int cchTextMax)

 {

-	LV_ITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LV_ITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.iSubItem = iSubItem;

 	lvi.cchTextMax = cchTextMax;

 	lvi.pszText = text;

@@ -88,43 +88,41 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 	static int iInit = TRUE;

 	TCITEM tci;

 

-	switch(msg) {

+	switch (msg) {

 	case WM_INITDIALOG:

-		{

-			iInit = TRUE;

-			tci.mask = TCIF_PARAM|TCIF_TEXT;

-

-			tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_GENERAL),hwnd,DlgProcOptionsGeneral);

-			tci.pszText = (LPSTR)sim201;

-			TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 0, &tci);

+		iInit = TRUE;

+		tci.mask = TCIF_PARAM | TCIF_TEXT;

+

+		tci.lParam = (LPARAM)CreateDialog(g_hInst, MAKEINTRESOURCE(IDD_TAB_GENERAL), hwnd, DlgProcOptionsGeneral);

+		tci.pszText = (LPSTR)sim201;

+		TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 0, &tci);

+		EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);

+

+		tci.lParam = (LPARAM)CreateDialog(g_hInst, MAKEINTRESOURCE(IDD_TAB_PROTO), hwnd, DlgProcOptionsProto);

+		tci.pszText = (LPSTR)sim202;

+		TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 2, &tci);

+		EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);

+		ShowWindow((HWND)tci.lParam, SW_HIDE);

+

+		if (bPGP && bPGPloaded) {

+			tci.lParam = (LPARAM)CreateDialog(g_hInst, MAKEINTRESOURCE(IDD_TAB_PGP), hwnd, DlgProcOptionsPGP);

+			tci.pszText = (LPSTR)sim214;

+			TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 3, &tci);

 			EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);

+			ShowWindow((HWND)tci.lParam, SW_HIDE);

+		}

 

-			tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_PROTO),hwnd,DlgProcOptionsProto);

-			tci.pszText = (LPSTR)sim202;

-			TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 2, &tci);

+		if (bGPG && bGPGloaded) {

+			tci.lParam = (LPARAM)CreateDialog(g_hInst, MAKEINTRESOURCE(IDD_TAB_GPG), hwnd, DlgProcOptionsGPG);

+			tci.pszText = (LPSTR)sim226;

+			TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 4, &tci);

 			EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);

 			ShowWindow((HWND)tci.lParam, SW_HIDE);

-

-			if (bPGP && bPGPloaded) {

-				tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_PGP),hwnd,DlgProcOptionsPGP);

-				tci.pszText = (LPSTR)sim214;

-				TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 3, &tci);

-				EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);

-				ShowWindow((HWND)tci.lParam, SW_HIDE);

-			}

-

-			if (bGPG && bGPGloaded) {

-				tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_GPG),hwnd,DlgProcOptionsGPG);

-				tci.pszText = (LPSTR)sim226;

-				TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 4, &tci);

-				EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);

-				ShowWindow((HWND)tci.lParam, SW_HIDE);

-			}

-

-			// add more tabs here if needed

-			// activate the final tab

-			iInit = FALSE;

 		}

+

+		// add more tabs here if needed

+		// activate the final tab

+		iInit = FALSE;

 		return TRUE;

 

 	case PSM_CHANGED: // used so tabs dont have to call SendMessage(GetParent(GetParent(hwnd)), PSM_CHANGED, 0, 0);

@@ -133,39 +131,39 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 		break;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case ID_UPDATE_CLIST:

 			tci.mask = TCIF_PARAM;

-			TabCtrl_GetItem(GetDlgItem(hwnd,IDC_OPTIONSTAB),0,&tci);

-			SendMessage((HWND)tci.lParam,WM_COMMAND,ID_UPDATE_CLIST,0);

+			TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 0, &tci);

+			SendMessage((HWND)tci.lParam, WM_COMMAND, ID_UPDATE_CLIST, 0);

 			break;

 

 		case ID_UPDATE_PLIST:

-			if (!bPGP ) break;

+			if (!bPGP) break;

 			tci.mask = TCIF_PARAM;

-			TabCtrl_GetItem(GetDlgItem(hwnd,IDC_OPTIONSTAB),2,&tci);

-			SendMessage((HWND)tci.lParam,WM_COMMAND,ID_UPDATE_CLIST,0);

+			TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 2, &tci);

+			SendMessage((HWND)tci.lParam, WM_COMMAND, ID_UPDATE_CLIST, 0);

 			break;

 

 		case ID_UPDATE_GLIST:

-			if (!bGPG ) break;

+			if (!bGPG) break;

 			tci.mask = TCIF_PARAM;

-			TabCtrl_GetItem(GetDlgItem(hwnd,IDC_OPTIONSTAB),3,&tci);

-			SendMessage((HWND)tci.lParam,WM_COMMAND,ID_UPDATE_GLIST,0);

+			TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 3, &tci);

+			SendMessage((HWND)tci.lParam, WM_COMMAND, ID_UPDATE_GLIST, 0);

 			break;

 		}

 		break;

 

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

 			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

 				tci.mask = TCIF_PARAM;

-				int cnt = TabCtrl_GetItemCount(GetDlgItem(hwnd,IDC_OPTIONSTAB));

-				for (int i=0;i<cnt;i++) {

-					TabCtrl_GetItem(GetDlgItem(hwnd,IDC_OPTIONSTAB),i,&tci);

-					SendMessage((HWND)tci.lParam,WM_NOTIFY,0,lParam);

+				int cnt = TabCtrl_GetItemCount(GetDlgItem(hwnd, IDC_OPTIONSTAB));

+				for (int i = 0; i < cnt; i++) {

+					TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), i, &tci);

+					SendMessage((HWND)tci.lParam, WM_NOTIFY, 0, lParam);

 				}

 			}

 			break;

@@ -174,14 +172,14 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 			switch (((LPNMHDR)lParam)->code) {

 			case TCN_SELCHANGING:

 				tci.mask = TCIF_PARAM;

-				TabCtrl_GetItem(GetDlgItem(hwnd,IDC_OPTIONSTAB),TabCtrl_GetCurSel(GetDlgItem(hwnd,IDC_OPTIONSTAB)),&tci);

-				ShowWindow((HWND)tci.lParam,SW_HIDE);

+				TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB)), &tci);

+				ShowWindow((HWND)tci.lParam, SW_HIDE);

 				break;

 

 			case TCN_SELCHANGE:

 				tci.mask = TCIF_PARAM;

-				TabCtrl_GetItem(GetDlgItem(hwnd,IDC_OPTIONSTAB),TabCtrl_GetCurSel(GetDlgItem(hwnd,IDC_OPTIONSTAB)),&tci);

-				ShowWindow((HWND)tci.lParam,SW_SHOW);

+				TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB)), &tci);

+				ShowWindow((HWND)tci.lParam, SW_SHOW);

 				break;

 			}

 		}

@@ -197,9 +195,9 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 {

 	static int iInit = TRUE;

 	static HIMAGELIST hLarge, hSmall;

-	int i,idx; pUinKey ptr;

+	int i, idx; pUinKey ptr;

 

-	HWND hLV = GetDlgItem(hDlg,IDC_STD_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_STD_USERLIST);

 

 	switch (wMsg) {

 	case WM_INITDIALOG:

@@ -210,7 +208,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 

 		hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), iBmpDepth, 1, 1);

 		hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), iBmpDepth, 1, 1);

-		for (i=0; i < ICO_CNT; i++) {

+		for (i = 0; i < ICO_CNT; i++) {

 			ImageList_AddIcon(hSmall, g_hICO[i]);

 			ImageList_AddIcon(hLarge, g_hICO[i]);

 		}

@@ -224,7 +222,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 			LVCOLUMN lvc;

 			lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;

 			lvc.fmt = LVCFMT_LEFT;

-			for (i=0; szColHdr[i]; i++) {

+			for (i = 0; szColHdr[i]; i++) {

 				lvc.iSubItem = i;

 				lvc.pszText = (LPSTR)szColHdr[i];

 				lvc.cx = iColWidth[i];

@@ -232,7 +230,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 			}

 		}

 

-		RefreshGeneralDlg(hDlg,TRUE);

+		RefreshGeneralDlg(hDlg, TRUE);

 		EnableWindow(hLV, true);

 

 		iInit = FALSE;

@@ -245,20 +243,20 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 

 	case WM_PAINT:

 		if (!iInit)

-			InvalidateRect(hDlg,NULL,FALSE);

+			InvalidateRect(hDlg, NULL, FALSE);

 		break;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case ID_ALWAYS:

 		case ID_ENABLED:

 		case ID_DISABLED:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

-				ptr->tstatus = LOWORD(wParam)-ID_DISABLED;

-				setListViewStatus(hLV,idx,ptr->tstatus);

-				setListViewIcon(hLV,idx,ptr);

+				ptr->tstatus = LOWORD(wParam) - ID_DISABLED;

+				setListViewStatus(hLV, idx, ptr->tstatus);

+				setListViewIcon(hLV, idx, ptr);

 			}

 			break;

 

@@ -268,77 +266,77 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 		case ID_SIM_RSAAES:

 		case ID_SIM_RSA:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

-				ptr->tmode = LOWORD(wParam)-ID_SIM_NATIVE;

-				setListViewMode(hLV,idx,ptr->tmode);

-				setListViewIcon(hLV,idx,ptr);

+				ptr->tmode = LOWORD(wParam) - ID_SIM_NATIVE;

+				setListViewMode(hLV, idx, ptr->tmode);

+				setListViewIcon(hLV, idx, ptr);

 			}

 			break;

 

 		case ID_SETPSK:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

-				LPSTR buffer = (LPSTR)alloca(PSKSIZE+1);

+				LPSTR buffer = (LPSTR)alloca(PSKSIZE + 1);

 				getContactName(ptr->hContact, buffer);

-				int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PSK),NULL,DlgProcSetPSK,(LPARAM)buffer);

+				int res = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_PSK), NULL, DlgProcSetPSK, (LPARAM)buffer);

 				if (res == IDOK) {

-					setListViewPSK(hLV,idx,1);

-					db_set_s(ptr->hContact,MODULENAME,"tPSK",buffer);

+					setListViewPSK(hLV, idx, 1);

+					db_set_s(ptr->hContact, MODULENAME, "tPSK", buffer);

 				}

 			}

 			break;

 

 		case ID_DELPSK:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

-				setListViewPSK(hLV,idx,0);

+				setListViewPSK(hLV, idx, 0);

 				db_unset(ptr->hContact, MODULENAME, "tPSK");

 			}

 			break;

 

 		case ID_DELPUBL:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

-				setListViewPUB(hLV,idx,0);

+				setListViewPUB(hLV, idx, 0);

 			}

 			break;

 

 		case ID_EXPPUBL:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

 				if (!ptr->keyLoaded) {

 					createRSAcntx(ptr);

 					loadRSAkey(ptr);

 				}

 				if (ptr->keyLoaded) {

-					LPSTR buffer = (LPSTR) alloca(RSASIZE);

-					exp->rsa_export_pubkey(ptr->cntx,buffer);

-					if (!SaveExportRSAKeyDlg(hDlg,buffer,0))

-						msgbox(hDlg,sim114,MODULENAME,MB_OK|MB_ICONEXCLAMATION);

+					LPSTR buffer = (LPSTR)alloca(RSASIZE);

+					exp->rsa_export_pubkey(ptr->cntx, buffer);

+					if (!SaveExportRSAKeyDlg(hDlg, buffer, 0))

+						msgbox(hDlg, sim114, MODULENAME, MB_OK | MB_ICONEXCLAMATION);

 				}

 			}

 			return TRUE;

 

 		case ID_IMPPUBL:

 			idx = ListView_GetSelectionMark(hLV);

-			ptr = (pUinKey) getListViewParam(hLV,idx);

+			ptr = (pUinKey)getListViewParam(hLV, idx);

 			if (ptr) {

 				createRSAcntx(ptr);

-				LPSTR pub = (LPSTR) alloca(RSASIZE);

-				if (!LoadImportRSAKeyDlg(hDlg,pub,0)) return TRUE;

-				if (exp->rsa_import_pubkey(ptr->cntx,pub)) {

+				LPSTR pub = (LPSTR)alloca(RSASIZE);

+				if (!LoadImportRSAKeyDlg(hDlg, pub, 0)) return TRUE;

+				if (exp->rsa_import_pubkey(ptr->cntx, pub)) {

 					int len;

 					exp->rsa_get_pubkey(ptr->cntx, (PBYTE)pub, &len);

 					db_set_blob(ptr->hContact, MODULENAME, "rsa_pub", pub, len);

 

-					setListViewPUB(hLV,idx,1);

+					setListViewPUB(hLV, idx, 1);

 				}

-				else msgbox(hDlg,sim115,MODULENAME,MB_OK|MB_ICONEXCLAMATION);

+				else msgbox(hDlg, sim115, MODULENAME, MB_OK | MB_ICONEXCLAMATION);

 			}

 			return TRUE;

 

@@ -387,7 +385,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 		break;

 

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

 			if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) {

 				iInit = TRUE;

@@ -398,82 +396,82 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR
 			break;

 

 		case IDC_STD_USERLIST:

-			switch(((LPNMHDR)lParam)->code) {

+			switch (((LPNMHDR)lParam)->code) {

 			case NM_DBLCLK:

 				if (LPNMLISTVIEW(lParam)->iSubItem == 2) {

 					idx = LPNMLISTVIEW(lParam)->iItem;

-					ptr = (pUinKey) getListViewParam(hLV,idx);

+					ptr = (pUinKey)getListViewParam(hLV, idx);

 					if (ptr) {

 						ptr->tmode++;

-						if (!bPGP && ptr->tmode == MODE_PGP ) ptr->tmode++;

-						if (!bGPG && ptr->tmode == MODE_GPG ) ptr->tmode++;

-						if (ptr->tmode>=MODE_CNT ) ptr->tmode=MODE_NATIVE;

-						setListViewMode(hLV,idx,ptr->tmode);

-						setListViewIcon(hLV,idx,ptr);

+						if (!bPGP && ptr->tmode == MODE_PGP) ptr->tmode++;

+						if (!bGPG && ptr->tmode == MODE_GPG) ptr->tmode++;

+						if (ptr->tmode >= MODE_CNT) ptr->tmode = MODE_NATIVE;

+						setListViewMode(hLV, idx, ptr->tmode);

+						setListViewIcon(hLV, idx, ptr);

 						SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);

 					}

 				}

 				if (LPNMLISTVIEW(lParam)->iSubItem == 3) {

 					idx = LPNMLISTVIEW(lParam)->iItem;

-					ptr = (pUinKey) getListViewParam(hLV,idx);

+					ptr = (pUinKey)getListViewParam(hLV, idx);

 					if (ptr) {

-						ptr->tstatus++; if (ptr->tstatus>(ptr->tmode == MODE_RSAAES?1:2)) ptr->tstatus=0;

-						setListViewStatus(hLV,idx,ptr->tstatus);

-						setListViewIcon(hLV,idx,ptr);

+						ptr->tstatus++; if (ptr->tstatus > (ptr->tmode == MODE_RSAAES ? 1 : 2)) ptr->tstatus = 0;

+						setListViewStatus(hLV, idx, ptr->tstatus);

+						setListViewIcon(hLV, idx, ptr);

 						SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);

 					}

 				}

 				break;

 

 			case NM_RCLICK:

-				{

-					LPNMLISTVIEW lpLV = (LPNMLISTVIEW)lParam;

-					ptr = (pUinKey) getListViewParam(hLV,lpLV->iItem);

-					if (ptr) {

-						POINT p; GetCursorPos(&p);

-						HMENU hMenu = NULL;

-						if (ptr->tmode == MODE_NATIVE || ptr->tmode == MODE_RSAAES) {

-							switch( lpLV->iSubItem) {

-							case 2: // mode

-								hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDM_CLIST2));

-								break;

-							case 3: // status

-								hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE)?IDM_CLIST01:IDM_CLIST11));

-								break;

-							case 4: // PSK/PUB

-							case 5: // SHA1

-								hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE)?IDM_CLIST02:IDM_CLIST12));

-								break;

-							default: // full menu

-								hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE)?IDM_CLIST0:IDM_CLIST1));

-								break;

-							}

-							CheckMenuItem(hMenu, ID_DISABLED+ptr->tstatus, MF_CHECKED );

-							if (ptr->tmode == MODE_NATIVE) {

-								if (!hasKey(ptr)) EnableMenuItem(hMenu, ID_DELPSK, MF_GRAYED );

-							}

-							else if (ptr->tmode == MODE_RSAAES) {

-								if (!hasKey(ptr)) {

-									EnableMenuItem(hMenu, ID_EXPPUBL, MF_GRAYED );

-									EnableMenuItem(hMenu, ID_DELPUBL, MF_GRAYED );

-								}

+			{

+				LPNMLISTVIEW lpLV = (LPNMLISTVIEW)lParam;

+				ptr = (pUinKey)getListViewParam(hLV, lpLV->iItem);

+				if (ptr) {

+					POINT p; GetCursorPos(&p);

+					HMENU hMenu = NULL;

+					if (ptr->tmode == MODE_NATIVE || ptr->tmode == MODE_RSAAES) {

+						switch (lpLV->iSubItem) {

+						case 2: // mode

+							hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDM_CLIST2));

+							break;

+						case 3: // status

+							hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST01 : IDM_CLIST11));

+							break;

+						case 4: // PSK/PUB

+						case 5: // SHA1

+							hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST02 : IDM_CLIST12));

+							break;

+						default: // full menu

+							hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST0 : IDM_CLIST1));

+							break;

+						}

+						CheckMenuItem(hMenu, ID_DISABLED + ptr->tstatus, MF_CHECKED);

+						if (ptr->tmode == MODE_NATIVE) {

+							if (!hasKey(ptr)) EnableMenuItem(hMenu, ID_DELPSK, MF_GRAYED);

+						}

+						else if (ptr->tmode == MODE_RSAAES) {

+							if (!hasKey(ptr)) {

+								EnableMenuItem(hMenu, ID_EXPPUBL, MF_GRAYED);

+								EnableMenuItem(hMenu, ID_DELPUBL, MF_GRAYED);

 							}

 						}

-						if (!hMenu )

-							hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDM_CLIST2));

-						TranslateMenu(hMenu);

-						CheckMenuItem(hMenu, ID_SIM_NATIVE+ptr->tmode, MF_CHECKED );

-						if (!bPGP ) EnableMenuItem(hMenu, ID_SIM_PGP, MF_GRAYED );

-						if (!bGPG ) EnableMenuItem(hMenu, ID_SIM_GPG, MF_GRAYED );

-						TrackPopupMenu(GetSubMenu(hMenu, 0), TPM_LEFTALIGN | TPM_TOPALIGN, p.x, p.y, 0, hDlg, 0);

-						DestroyMenu(hMenu);

 					}

+					if (!hMenu)

+						hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDM_CLIST2));

+					TranslateMenu(hMenu);

+					CheckMenuItem(hMenu, ID_SIM_NATIVE + ptr->tmode, MF_CHECKED);

+					if (!bPGP) EnableMenuItem(hMenu, ID_SIM_PGP, MF_GRAYED);

+					if (!bGPG) EnableMenuItem(hMenu, ID_SIM_GPG, MF_GRAYED);

+					TrackPopupMenu(GetSubMenu(hMenu, 0), TPM_LEFTALIGN | TPM_TOPALIGN, p.x, p.y, 0, hDlg, 0);

+					DestroyMenu(hMenu);

 				}

+			}

 				break;

 

 			case LVN_COLUMNCLICK:

 				bChangeSortOrder = true;

-				ListView_Sort(hLV,(LPARAM)(LPNMLISTVIEW(lParam)->iSubItem+0x01));

+				ListView_Sort(hLV, (LPARAM)(LPNMLISTVIEW(lParam)->iSubItem + 0x01));

 				bChangeSortOrder = false;

 			}

 			break;

@@ -489,7 +487,7 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM
 	char buf[32];

 	int idx;

 

-	HWND hLV = GetDlgItem(hDlg,IDC_PROTO);

+	HWND hLV = GetDlgItem(hDlg, IDC_PROTO);

 

 	switch (wMsg) {

 	case WM_INITDIALOG:

@@ -513,54 +511,54 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM
 

 	case WM_PAINT:

 		if (!iInit)

-			InvalidateRect(hDlg,NULL,FALSE);

+			InvalidateRect(hDlg, NULL, FALSE);

 		break;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDC_RSA_COPY:

 			char txt[128];

 			GetDlgItemText(hDlg, IDC_RSA_SHA, txt, sizeof(txt));

-			CopyToClipboard(hDlg,txt);

+			CopyToClipboard(hDlg, txt);

 			return TRUE;

 

 		case IDC_RSA_EXP:

-			{

-				LPSTR pub = (LPSTR) alloca(RSASIZE);

-				exp->rsa_export_keypair(CPP_MODE_RSA,NULL,pub,NULL);

-				if (!SaveExportRSAKeyDlg(hDlg,pub,0))

-					msgbox(hDlg,sim114,MODULENAME,MB_OK|MB_ICONEXCLAMATION);

-			}

+		{

+			LPSTR pub = (LPSTR)alloca(RSASIZE);

+			exp->rsa_export_keypair(CPP_MODE_RSA, NULL, pub, NULL);

+			if (!SaveExportRSAKeyDlg(hDlg, pub, 0))

+				msgbox(hDlg, sim114, MODULENAME, MB_OK | MB_ICONEXCLAMATION);

+		}

 			return TRUE;

 

 		case IDC_RSA_EXPPRIV:

-			{

-				LPSTR passphrase = (LPSTR) alloca(RSASIZE);

-				int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PASSPHRASE),NULL,DlgProcSetPassphrase,(LPARAM)passphrase);

-				if (res == IDOK) {

-					LPSTR priv = (LPSTR) alloca(RSASIZE);

-					exp->rsa_export_keypair(CPP_MODE_RSA,priv,NULL,passphrase);

-					if (!SaveExportRSAKeyDlg(hDlg,priv,1))

-						msgbox(hDlg,sim112,MODULENAME,MB_OK|MB_ICONEXCLAMATION);

-				}

+		{

+			LPSTR passphrase = (LPSTR)alloca(RSASIZE);

+			int res = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_PASSPHRASE), NULL, DlgProcSetPassphrase, (LPARAM)passphrase);

+			if (res == IDOK) {

+				LPSTR priv = (LPSTR)alloca(RSASIZE);

+				exp->rsa_export_keypair(CPP_MODE_RSA, priv, NULL, passphrase);

+				if (!SaveExportRSAKeyDlg(hDlg, priv, 1))

+					msgbox(hDlg, sim112, MODULENAME, MB_OK | MB_ICONEXCLAMATION);

 			}

+		}

 			return TRUE;

 

 		case IDC_RSA_IMPPRIV:

-			{

-				LPSTR priv = (LPSTR) alloca(RSASIZE);

-				if (!LoadImportRSAKeyDlg(hDlg,priv,1))

-					return TRUE;

+		{

+			LPSTR priv = (LPSTR)alloca(RSASIZE);

+			if (!LoadImportRSAKeyDlg(hDlg, priv, 1))

+				return TRUE;

 

-				LPSTR passphrase = (LPSTR) alloca(RSASIZE);

-				int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PASSPHRASE),NULL,DlgProcSetPassphrase,(LPARAM)passphrase);

-				if (res == IDOK) {

-					if (!exp->rsa_import_keypair(CPP_MODE_RSA,priv,passphrase))

-						msgbox(hDlg,sim113,MODULENAME,MB_OK|MB_ICONEXCLAMATION);

-					else // обновить SHA1 значение

-						RefreshProtoDlg(hDlg);

-				}

+			LPSTR passphrase = (LPSTR)alloca(RSASIZE);

+			int res = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_PASSPHRASE), NULL, DlgProcSetPassphrase, (LPARAM)passphrase);

+			if (res == IDOK) {

+				if (!exp->rsa_import_keypair(CPP_MODE_RSA, priv, passphrase))

+					msgbox(hDlg, sim113, MODULENAME, MB_OK | MB_ICONEXCLAMATION);

+				else // обновить SHA1 значение

+					RefreshProtoDlg(hDlg);

 			}

+		}

 			return TRUE;

 

 		case IDC_SPLITON:

@@ -569,15 +567,15 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM
 				idx = ListView_GetSelectionMark(hLV);

 				if (idx == -1)

 					break;

-				

+

 				idx = getListViewParam(hLV, idx);

-				switch(LOWORD(wParam)) {

+				switch (LOWORD(wParam)) {

 				case IDC_SPLITON:

-					GetDlgItemText(hDlg,IDC_SPLITON,buf,5);

+					GetDlgItemText(hDlg, IDC_SPLITON, buf, 5);

 					arProto[idx]->tsplit_on = atoi(buf);

 					break;

 				case IDC_SPLITOFF:

-					GetDlgItemText(hDlg,IDC_SPLITOFF,buf,5);

+					GetDlgItemText(hDlg, IDC_SPLITOFF, buf, 5);

 					arProto[idx]->tsplit_off = atoi(buf);

 					break;

 				}

@@ -589,28 +587,28 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM
 		break;

 

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

 			if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) {

 				iInit = TRUE;

 				ApplyProtoSettings(hDlg);

 				RefreshProtoDlg(hDlg);

 				RefreshContactListIcons();

-				SendMessage(GetParent(hDlg),WM_COMMAND,ID_UPDATE_CLIST,0);

+				SendMessage(GetParent(hDlg), WM_COMMAND, ID_UPDATE_CLIST, 0);

 				iInit = FALSE;

 			}

 			break;

 

 		case IDC_PROTO:

 			if (((LPNMHDR)lParam)->code == (UINT)NM_CLICK) {

-				idx = (int)getListViewParam(hLV,LPNMLISTVIEW(lParam)->iItem);

+				idx = (int)getListViewParam(hLV, LPNMLISTVIEW(lParam)->iItem);

 				if (idx == -1)

 					break;

 

-				EnableWindow(GetDlgItem(hDlg,IDC_SPLITON), true);

-				EnableWindow(GetDlgItem(hDlg,IDC_SPLITOFF), true);

-				mir_itoa(arProto[idx]->tsplit_on,buf,10);	SetDlgItemText(hDlg,IDC_SPLITON,buf);

-				mir_itoa(arProto[idx]->tsplit_off,buf,10);	SetDlgItemText(hDlg,IDC_SPLITOFF,buf);

+				EnableWindow(GetDlgItem(hDlg, IDC_SPLITON), true);

+				EnableWindow(GetDlgItem(hDlg, IDC_SPLITOFF), true);

+				mir_itoa(arProto[idx]->tsplit_on, buf, 10);	SetDlgItemText(hDlg, IDC_SPLITON, buf);

+				mir_itoa(arProto[idx]->tsplit_off, buf, 10);	SetDlgItemText(hDlg, IDC_SPLITOFF, buf);

 				SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);

 			}

 		}

@@ -627,7 +625,7 @@ INT_PTR CALLBACK DlgProcOptionsPGP(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 	static HIMAGELIST hLarge, hSmall;

 	int i;

 

-	HWND hLV = GetDlgItem(hDlg,IDC_PGP_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_PGP_USERLIST);

 

 	switch (wMsg) {

 	case WM_INITDIALOG:

@@ -658,7 +656,7 @@ INT_PTR CALLBACK DlgProcOptionsPGP(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 				LV_InsertColumn(hLV, i, &lvc);

 			}

 		}

-		RefreshPGPDlg(hDlg,TRUE);

+		RefreshPGPDlg(hDlg, TRUE);

 		iInit = FALSE;

 		return TRUE;

 

@@ -669,52 +667,52 @@ INT_PTR CALLBACK DlgProcOptionsPGP(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 

 	case WM_PAINT:

 		if (!iInit)

-			InvalidateRect(hDlg,NULL,FALSE);

+			InvalidateRect(hDlg, NULL, FALSE);

 		break;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDC_SET_KEYRINGS:

-			{

-				char PubRingPath[MAX_PATH], SecRingPath[MAX_PATH];

-				PubRingPath[0]='\0'; SecRingPath[0]='\0';

-				bPGPkeyrings = pgp_open_keyrings(PubRingPath,SecRingPath);

-				if (bPGPkeyrings && PubRingPath[0] && SecRingPath[0]) {

-					db_set_s(0,MODULENAME,"pgpPubRing",PubRingPath);

-					db_set_s(0,MODULENAME,"pgpSecRing",SecRingPath);

-				}

-				SetDlgItemText(hDlg, IDC_KEYRING_STATUS, bPGPkeyrings?Translate(sim216):Translate(sim217));

+		{

+			char PubRingPath[MAX_PATH], SecRingPath[MAX_PATH];

+			PubRingPath[0] = '\0'; SecRingPath[0] = '\0';

+			bPGPkeyrings = pgp_open_keyrings(PubRingPath, SecRingPath);

+			if (bPGPkeyrings && PubRingPath[0] && SecRingPath[0]) {

+				db_set_s(0, MODULENAME, "pgpPubRing", PubRingPath);

+				db_set_s(0, MODULENAME, "pgpSecRing", SecRingPath);

 			}

+			SetDlgItemText(hDlg, IDC_KEYRING_STATUS, bPGPkeyrings ? Translate(sim216) : Translate(sim217));

+		}

 			return FALSE;

 

 		case IDC_NO_KEYRINGS:

-			{

-				BOOL bNoKR = (SendMessage(GetDlgItem(hDlg, IDC_NO_KEYRINGS),BM_GETCHECK,0L,0L) == BST_CHECKED);

-				EnableWindow(GetDlgItem(hDlg, IDC_SET_KEYRINGS), !bNoKR);

-				EnableWindow(GetDlgItem(hDlg, IDC_LOAD_PRIVKEY), bNoKR);

-				SetDlgItemText(hDlg, IDC_KEYRING_STATUS, bNoKR?Translate(sim225):((bPGP9)?Translate(sim220):(bPGPkeyrings?Translate(sim216):Translate(sim217))));

-			}

+		{

+			BOOL bNoKR = (SendMessage(GetDlgItem(hDlg, IDC_NO_KEYRINGS), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+			EnableWindow(GetDlgItem(hDlg, IDC_SET_KEYRINGS), !bNoKR);

+			EnableWindow(GetDlgItem(hDlg, IDC_LOAD_PRIVKEY), bNoKR);

+			SetDlgItemText(hDlg, IDC_KEYRING_STATUS, bNoKR ? Translate(sim225) : ((bPGP9) ? Translate(sim220) : (bPGPkeyrings ? Translate(sim216) : Translate(sim217))));

+		}

 			break;

 

 		case IDC_LOAD_PRIVKEY:

-			{

-				char KeyPath[MAX_PATH]; KeyPath[0]='\0';

-				if (ShowSelectKeyDlg(hDlg,KeyPath)) {

-					char *priv = LoadKeys(KeyPath,true);

-					if (priv) {

-						db_set_s(0,MODULENAME,"tpgpPrivKey",priv);

-						mir_free(priv);

-					}

-					else {

-						db_unset(0,MODULENAME,"tpgpPrivKey");

-					}

+		{

+			char KeyPath[MAX_PATH]; KeyPath[0] = '\0';

+			if (ShowSelectKeyDlg(hDlg, KeyPath)) {

+				char *priv = LoadKeys(KeyPath, true);

+				if (priv) {

+					db_set_s(0, MODULENAME, "tpgpPrivKey", priv);

+					mir_free(priv);

+				}

+				else {

+					db_unset(0, MODULENAME, "tpgpPrivKey");

 				}

 			}

+		}

 			break;

 

 		case ID_UPDATE_PLIST:

 			iInit = TRUE;

-			RefreshPGPDlg(hDlg,FALSE);

+			RefreshPGPDlg(hDlg, FALSE);

 			iInit = FALSE;

 			return TRUE;

 		}

@@ -723,21 +721,21 @@ INT_PTR CALLBACK DlgProcOptionsPGP(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 		break;

 

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

 			if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) {

 				iInit = TRUE;

 				ApplyPGPSettings(hDlg);

-				RefreshPGPDlg(hDlg,FALSE);

+				RefreshPGPDlg(hDlg, FALSE);

 				iInit = FALSE;

 			}

 			break;

 

 		case IDC_PGP_USERLIST:

-			switch(((LPNMHDR)lParam)->code) {

+			switch (((LPNMHDR)lParam)->code) {

 			case LVN_COLUMNCLICK:

 				bChangeSortOrder = true;

-				ListView_Sort(hLV,(LPARAM)(LPNMLISTVIEW(lParam)->iSubItem+0x11));

+				ListView_Sort(hLV, (LPARAM)(LPNMLISTVIEW(lParam)->iSubItem + 0x11));

 				bChangeSortOrder = false;

 				break;

 			}

@@ -753,7 +751,7 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 	static HIMAGELIST hLarge, hSmall;

 	int i, idx; pUinKey ptr;

 

-	HWND hLV = GetDlgItem(hDlg,IDC_GPG_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_GPG_USERLIST);

 

 	switch (wMsg) {

 	case WM_INITDIALOG:

@@ -785,7 +783,7 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 			}

 		}

 

-		RefreshGPGDlg(hDlg,TRUE);

+		RefreshGPGDlg(hDlg, TRUE);

 		iInit = FALSE;

 		return TRUE;

 

@@ -796,37 +794,37 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 

 	case WM_PAINT:

 		if (!iInit)

-			InvalidateRect(hDlg,NULL,FALSE);

+			InvalidateRect(hDlg, NULL, FALSE);

 		break;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDC_BROWSEEXECUTABLE_BTN:

-			{

-				char gpgexe[256];

-				char filter[128];

-				GetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, gpgexe, sizeof(gpgexe));

-

-				// filter zusammensetzen

-				mir_snprintf(filter, SIZEOF(filter), _T("%s (*.exe)%c*.exe%c%c"), Translate("Executable Files"), 0, 0, 0);

-

-				// OPENFILENAME initialisieren

-				OPENFILENAME ofn = { sizeof(ofn) };

-				ofn.hwndOwner = hDlg;

-				ofn.lpstrFilter = filter;

-				ofn.lpstrFile = gpgexe;

-				ofn.nMaxFile = sizeof(gpgexe);

-				ofn.lpstrTitle = Translate("Select GnuPG Executable");

-				ofn.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;

-

-				if (GetOpenFileName(&ofn))

-					SetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, ofn.lpstrFile);

-			}

+		{

+			char gpgexe[256];

+			char filter[128];

+			GetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, gpgexe, sizeof(gpgexe));

+

+			// filter zusammensetzen

+			mir_snprintf(filter, SIZEOF(filter), _T("%s (*.exe)%c*.exe%c%c"), Translate("Executable Files"), 0, 0, 0);

+

+			// OPENFILENAME initialisieren

+			OPENFILENAME ofn = { sizeof(ofn) };

+			ofn.hwndOwner = hDlg;

+			ofn.lpstrFilter = filter;

+			ofn.lpstrFile = gpgexe;

+			ofn.nMaxFile = sizeof(gpgexe);

+			ofn.lpstrTitle = Translate("Select GnuPG Executable");

+			ofn.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;

+

+			if (GetOpenFileName(&ofn))

+				SetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, ofn.lpstrFile);

+		}

 			break;

 

 		case ID_UPDATE_GLIST:

 			iInit = TRUE;

-			RefreshGPGDlg(hDlg,FALSE);

+			RefreshGPGDlg(hDlg, FALSE);

 			iInit = FALSE;

 			return TRUE;

 		}

@@ -835,32 +833,32 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 		break;

 

 	case WM_NOTIFY:

-		switch(((LPNMHDR)lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

 			if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) {

 				iInit = TRUE;

 				ApplyGPGSettings(hDlg);

-				RefreshGPGDlg(hDlg,FALSE);

+				RefreshGPGDlg(hDlg, FALSE);

 				iInit = FALSE;

 			}

 			break;

 

 		case IDC_GPG_USERLIST:

-			switch(((LPNMHDR)lParam)->code) {

+			switch (((LPNMHDR)lParam)->code) {

 			case NM_DBLCLK:

 				if (LPNMLISTVIEW(lParam)->iSubItem == 3) {

 					idx = LPNMLISTVIEW(lParam)->iItem;

-					ptr = (pUinKey) getListViewParam(hLV,idx);

-					if (!ptr ) break;

-					ptr->tgpgMode++; ptr->tgpgMode&=1;

-					LV_SetItemTextA(hLV, LPNMLISTVIEW(lParam)->iItem, LPNMLISTVIEW(lParam)->iSubItem, (ptr->tgpgMode)?Translate(sim228):Translate(sim229));

+					ptr = (pUinKey)getListViewParam(hLV, idx);

+					if (!ptr) break;

+					ptr->tgpgMode++; ptr->tgpgMode &= 1;

+					LV_SetItemTextA(hLV, LPNMLISTVIEW(lParam)->iItem, LPNMLISTVIEW(lParam)->iSubItem, (ptr->tgpgMode) ? Translate(sim228) : Translate(sim229));

 					SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);

 				}

 				break;

 

 			case LVN_COLUMNCLICK:

 				bChangeSortOrder = true;

-				ListView_Sort(hLV,(LPARAM)(LPNMLISTVIEW(lParam)->iSubItem+0x21));

+				ListView_Sort(hLV, (LPARAM)(LPNMLISTVIEW(lParam)->iSubItem + 0x21));

 				bChangeSortOrder = false;

 			}

 		}

@@ -869,29 +867,29 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l
 	return FALSE;

 }

 

-INT_PTR CALLBACK DlgProcSetPSK(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcSetPSK(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	static char *buffer;

-	switch(uMsg) {

+	switch (uMsg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hDlg);

-		SendDlgItemMessage(hDlg, IDC_EDIT1, EM_LIMITTEXT, PSKSIZE-1, 0);

+		SendDlgItemMessage(hDlg, IDC_EDIT1, EM_LIMITTEXT, PSKSIZE - 1, 0);

 		SetDlgItemTextW(hDlg, IDC_EDIT2, (LPWSTR)lParam);

 		buffer = (LPSTR)lParam;

 		return TRUE;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDOK:

 			if (GetDlgItemTextA(hDlg, IDC_EDIT1, buffer, PSKSIZE) < 8) {

 				msgbox1(hDlg, sim211, MODULENAME, MB_OK | MB_ICONEXCLAMATION);

 				return TRUE;

 			}

-			EndDialog(hDlg,IDOK);

+			EndDialog(hDlg, IDOK);

 			break;

 

 		case IDCANCEL:

-			EndDialog(hDlg,IDCANCEL);

+			EndDialog(hDlg, IDCANCEL);

 			break;

 		}

 		break;

@@ -903,26 +901,26 @@ INT_PTR CALLBACK DlgProcSetPSK(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 }

 

 

-INT_PTR CALLBACK DlgProcSetPassphrase(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcSetPassphrase(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	static LPSTR buffer;

 

-	switch(uMsg) {

+	switch (uMsg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hDlg);

-		SendDlgItemMessage(hDlg,IDC_PASSPHRASE,EM_LIMITTEXT,RSASIZE-1,0);

+		SendDlgItemMessage(hDlg, IDC_PASSPHRASE, EM_LIMITTEXT, RSASIZE - 1, 0);

 		buffer = (LPSTR)lParam;

 		return TRUE;

 

 	case WM_COMMAND:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDOK:

-			GetDlgItemTextA(hDlg,IDC_PASSPHRASE,buffer,RSASIZE);

-			EndDialog(hDlg,IDOK);

+			GetDlgItemTextA(hDlg, IDC_PASSPHRASE, buffer, RSASIZE);

+			EndDialog(hDlg, IDOK);

 			break;

 

 		case IDCANCEL:

-			EndDialog(hDlg,IDCANCEL);

+			EndDialog(hDlg, IDCANCEL);

 			break;

 		}

 		break;

@@ -943,36 +941,36 @@ void RefreshGeneralDlg(HWND hDlg, BOOL iInit)
 

 	// Key Exchange Timeout

 	UINT data = db_get_w(0, MODULENAME, "ket", 10);

-	mir_itoa(data,timeout,10);

-	SetDlgItemText(hDlg,IDC_KET,timeout);

+	mir_itoa(data, timeout, 10);

+	SetDlgItemText(hDlg, IDC_KET, timeout);

 

 	// Offline Key Timeout

 	data = db_get_w(0, MODULENAME, "okt", 2);

-	mir_itoa(data,timeout,10);

-	SetDlgItemText(hDlg,IDC_OKT,timeout);

+	mir_itoa(data, timeout, 10);

+	SetDlgItemText(hDlg, IDC_OKT, timeout);

 

 	GetFlags();

 

-	SendMessage( GetDlgItem(hDlg,IDC_SFT), BM_SETCHECK, (bSFT) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_SOM), BM_SETCHECK, (bSOM) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_ASI), BM_SETCHECK, (bASI) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_MCD), BM_SETCHECK, (bMCD) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_SCM), BM_SETCHECK, (bSCM) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_DGP), BM_SETCHECK, (bDGP) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_AIP), BM_SETCHECK, (bAIP) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_NOL), BM_SETCHECK, (bNOL) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_AAK), BM_SETCHECK, (bAAK) ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_MCM), BM_SETCHECK, (bMCM) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_SFT), BM_SETCHECK, (bSFT) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_SOM), BM_SETCHECK, (bSOM) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_ASI), BM_SETCHECK, (bASI) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_MCD), BM_SETCHECK, (bMCD) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_SCM), BM_SETCHECK, (bSCM) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_DGP), BM_SETCHECK, (bDGP) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_AIP), BM_SETCHECK, (bAIP) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_NOL), BM_SETCHECK, (bNOL) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_AAK), BM_SETCHECK, (bAAK) ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_MCM), BM_SETCHECK, (bMCM) ? BST_CHECKED : BST_UNCHECKED, 0);

 

 	// Select {OFF,PGP,GPG}

-	SendMessage( GetDlgItem(hDlg,IDC_PGP), BM_SETCHECK, bPGP ? BST_CHECKED : BST_UNCHECKED, 0);

-	SendMessage( GetDlgItem(hDlg,IDC_GPG), BM_SETCHECK, bGPG ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_PGP), BM_SETCHECK, bPGP ? BST_CHECKED : BST_UNCHECKED, 0);

+	SendMessage(GetDlgItem(hDlg, IDC_GPG), BM_SETCHECK, bGPG ? BST_CHECKED : BST_UNCHECKED, 0);

 

 	// rebuild list of contacts

-	HWND hLV = GetDlgItem(hDlg,IDC_STD_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_STD_USERLIST);

 	ListView_DeleteAllItems(hLV);

 

-	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LVITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

 	char tmp[NAMSIZE];

@@ -998,37 +996,37 @@ void RefreshGeneralDlg(HWND hDlg, BOOL iInit)
 

 			setListViewMode(hLV, itemNum, ptr->tmode);

 			setListViewStatus(hLV, itemNum, ptr->tstatus);

-			if (ptr->mode == MODE_NATIVE )	setListViewPSK(hLV, itemNum, hasKey(ptr));

+			if (ptr->mode == MODE_NATIVE)	setListViewPSK(hLV, itemNum, hasKey(ptr));

 			else				setListViewPUB(hLV, itemNum, hasKey(ptr));

 			setListViewIcon(hLV, itemNum, ptr);

 		}

 	}

-	ListView_Sort(hLV,0);

+	ListView_Sort(hLV, 0);

 }

 

 void RefreshProtoDlg(HWND hDlg)

 {

-	HWND hLV = GetDlgItem(hDlg,IDC_PROTO);

+	HWND hLV = GetDlgItem(hDlg, IDC_PROTO);

 	ListView_DeleteAllItems(hLV);

 

 	LVITEM lvi = { 0 };

 	lvi.mask = LVIF_TEXT | LVIF_PARAM;

 

-	for (int i=0; i < arProto.getCount(); i++) {

-		lvi.iItem = i+1;

+	for (int i = 0; i < arProto.getCount(); i++) {

+		lvi.iItem = i + 1;

 		lvi.pszText = arProto[i]->name;

 		lvi.lParam = (LPARAM)i;

 		int itemNum = LV_InsertItemA(hLV, &lvi);

-		ListView_SetCheckState(hLV,itemNum, arProto[i]->inspecting);

+		ListView_SetCheckState(hLV, itemNum, arProto[i]->inspecting);

 	}

 

-	SetDlgItemText(hDlg,IDC_SPLITON,_T("0"));

-	SetDlgItemText(hDlg,IDC_SPLITOFF,_T("0"));

-	EnableWindow(GetDlgItem(hDlg,IDC_SPLITON), false);

-	EnableWindow(GetDlgItem(hDlg,IDC_SPLITOFF), false);

+	SetDlgItemText(hDlg, IDC_SPLITON, _T("0"));

+	SetDlgItemText(hDlg, IDC_SPLITOFF, _T("0"));

+	EnableWindow(GetDlgItem(hDlg, IDC_SPLITON), false);

+	EnableWindow(GetDlgItem(hDlg, IDC_SPLITOFF), false);

 

-	BYTE sha[64]; int len; exp->rsa_get_keyhash(CPP_MODE_RSA,NULL,NULL,(PBYTE)&sha,&len);

-	LPSTR txt = mir_strdup(to_hex(sha,len));

+	BYTE sha[64]; int len; exp->rsa_get_keyhash(CPP_MODE_RSA, NULL, NULL, (PBYTE)&sha, &len);

+	LPSTR txt = mir_strdup(to_hex(sha, len));

 	SetDlgItemText(hDlg, IDC_RSA_SHA, txt);

 	mir_free(txt);

 }

@@ -1036,11 +1034,11 @@ void RefreshProtoDlg(HWND hDlg)
 void RefreshPGPDlg(HWND hDlg, BOOL iInit)

 {

 	int ver = pgp_get_version();

-	bPGP9 = (ver>=0x03050000);

+	bPGP9 = (ver >= 0x03050000);

 

 	EnableWindow(GetDlgItem(hDlg, IDC_SET_KEYRINGS), bUseKeyrings && !bPGP9);

 	EnableWindow(GetDlgItem(hDlg, IDC_LOAD_PRIVKEY), !bUseKeyrings);

-	SetDlgItemText(hDlg, IDC_PGP_PRIVKEY, bPGPprivkey?Translate(sim222):Translate(sim223));

+	SetDlgItemText(hDlg, IDC_PGP_PRIVKEY, bPGPprivkey ? Translate(sim222) : Translate(sim223));

 

 	if (bPGPloaded && ver) {

 		char pgpVerStr[64];

@@ -1049,16 +1047,16 @@ void RefreshPGPDlg(HWND hDlg, BOOL iInit)
 	}

 	else SetDlgItemText(hDlg, IDC_PGP_SDK, Translate(sim219));

 

-	SetDlgItemText(hDlg, IDC_KEYRING_STATUS, !bUseKeyrings?Translate(sim225):((bPGP9)?Translate(sim220):(bPGPkeyrings?Translate(sim216):Translate(sim217))));

+	SetDlgItemText(hDlg, IDC_KEYRING_STATUS, !bUseKeyrings ? Translate(sim225) : ((bPGP9) ? Translate(sim220) : (bPGPkeyrings ? Translate(sim216) : Translate(sim217))));

 

 	// Disable keyrings use

-	SendMessage(GetDlgItem(hDlg,IDC_NO_KEYRINGS),BM_SETCHECK,(bUseKeyrings)?BST_UNCHECKED:BST_CHECKED,0L);

+	SendMessage(GetDlgItem(hDlg, IDC_NO_KEYRINGS), BM_SETCHECK, (bUseKeyrings) ? BST_UNCHECKED : BST_CHECKED, 0L);

 

 	// rebuild list of contacts

-	HWND hLV = GetDlgItem(hDlg,IDC_PGP_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_PGP_USERLIST);

 	ListView_DeleteAllItems(hLV);

 

-	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LVITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

 	char tmp[NAMSIZE];

@@ -1066,7 +1064,7 @@ void RefreshPGPDlg(HWND hDlg, BOOL iInit)
 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		pUinKey ptr = getUinKey(hContact);

 		if (ptr && ptr->mode == MODE_PGP && isSecureProtocol(hContact) && !isChatRoom(hContact)) {

-			LPSTR szKeyID = db_get_sa(hContact,MODULENAME,"pgp_abbr");

+			LPSTR szKeyID = db_get_sa(hContact, MODULENAME, "pgp_abbr");

 

 			lvi.iItem++;

 			lvi.iImage = (szKeyID != 0);

@@ -1079,46 +1077,46 @@ void RefreshPGPDlg(HWND hDlg, BOOL iInit)
 			getContactUin(hContact, tmp);

 			LV_SetItemText(hLV, itemNum, 1, tmp);

 

-			LV_SetItemTextA(hLV, itemNum, 2, (szKeyID)?szKeyID:Translate(sim221));

+			LV_SetItemTextA(hLV, itemNum, 2, (szKeyID) ? szKeyID : Translate(sim221));

 			SAFE_FREE(szKeyID);

 		}

 	}

-	ListView_Sort(hLV,(LPARAM)0x10);

+	ListView_Sort(hLV, (LPARAM)0x10);

 }

 

 void RefreshGPGDlg(HWND hDlg, BOOL iInit)

 {

-	LPSTR path = db_get_sa(0,MODULENAME,"gpgExec");

+	LPSTR path = db_get_sa(0, MODULENAME, "gpgExec");

 	if (path) {

 		SetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, path);

 		mir_free(path);

 	}

-	path = db_get_sa(0,MODULENAME,"gpgHome");

+	path = db_get_sa(0, MODULENAME, "gpgHome");

 	if (path) {

 		SetDlgItemText(hDlg, IDC_GPGHOME_EDIT, path);

 		mir_free(path);

 	}

-	BOOL bGPGLogFlag = db_get_b(0, MODULENAME, "gpgLogFlag",0);

-	SendMessage(GetDlgItem(hDlg,IDC_LOGGINGON_CBOX),BM_SETCHECK,(bGPGLogFlag)?BST_CHECKED:BST_UNCHECKED,0L);

-	path = db_get_sa(0,MODULENAME,"gpgLog");

+	BOOL bGPGLogFlag = db_get_b(0, MODULENAME, "gpgLogFlag", 0);

+	SendMessage(GetDlgItem(hDlg, IDC_LOGGINGON_CBOX), BM_SETCHECK, (bGPGLogFlag) ? BST_CHECKED : BST_UNCHECKED, 0L);

+	path = db_get_sa(0, MODULENAME, "gpgLog");

 	if (path) {

 		SetDlgItemText(hDlg, IDC_GPGLOGFILE_EDIT, path);

 		mir_free(path);

 	}

-	SendMessage(GetDlgItem(hDlg,IDC_SAVEPASS_CBOX),BM_SETCHECK,(bSavePass)?BST_CHECKED:BST_UNCHECKED,0L);

-	BOOL bGPGTmpFlag = db_get_b(0, MODULENAME, "gpgTmpFlag",0);

-	SendMessage(GetDlgItem(hDlg,IDC_TMPPATHON_CBOX),BM_SETCHECK,(bGPGTmpFlag)?BST_CHECKED:BST_UNCHECKED,0L);

-	path = db_get_sa(0,MODULENAME,"gpgTmp");

+	SendMessage(GetDlgItem(hDlg, IDC_SAVEPASS_CBOX), BM_SETCHECK, (bSavePass) ? BST_CHECKED : BST_UNCHECKED, 0L);

+	BOOL bGPGTmpFlag = db_get_b(0, MODULENAME, "gpgTmpFlag", 0);

+	SendMessage(GetDlgItem(hDlg, IDC_TMPPATHON_CBOX), BM_SETCHECK, (bGPGTmpFlag) ? BST_CHECKED : BST_UNCHECKED, 0L);

+	path = db_get_sa(0, MODULENAME, "gpgTmp");

 	if (path) {

 		SetDlgItemText(hDlg, IDC_GPGTMPPATH_EDIT, path);

 		mir_free(path);

 	}

 

 	// rebuild list of contacts

-	HWND hLV = GetDlgItem(hDlg,IDC_GPG_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_GPG_USERLIST);

 	ListView_DeleteAllItems(hLV);

 

-	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LVITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

 	char tmp[NAMSIZE];

@@ -1126,10 +1124,10 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit)
 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		pUinKey ptr = getUinKey(hContact);

 		if (ptr && ptr->mode == MODE_GPG && isSecureProtocol(hContact) && !isChatRoom(hContact)) {

-			if (iInit )

+			if (iInit)

 				ptr->tgpgMode = ptr->gpgMode;

 

-			LPSTR szKeyID = db_get_sa(hContact,MODULENAME,"gpg");

+			LPSTR szKeyID = db_get_sa(hContact, MODULENAME, "gpg");

 

 			lvi.iItem++;

 			lvi.iImage = (szKeyID != 0);

@@ -1142,12 +1140,12 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit)
 			getContactUin(hContact, tmp);

 			LV_SetItemText(hLV, itemNum, 1, tmp);

 

-			LV_SetItemTextA(hLV, itemNum, 2, (szKeyID)?szKeyID:Translate(sim221));

-			LV_SetItemTextA(hLV, itemNum, 3, (ptr->tgpgMode)?Translate(sim228):Translate(sim229));

+			LV_SetItemTextA(hLV, itemNum, 2, (szKeyID) ? szKeyID : Translate(sim221));

+			LV_SetItemTextA(hLV, itemNum, 3, (ptr->tgpgMode) ? Translate(sim228) : Translate(sim229));

 			SAFE_FREE(szKeyID);

 		}

 	}

-	ListView_Sort(hLV,(LPARAM)0x20);

+	ListView_Sort(hLV, (LPARAM)0x20);

 }

 

 ///////////////

@@ -1156,23 +1154,23 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit)
 

 void ResetGeneralDlg(HWND hDlg)

 {

-	SetDlgItemText(hDlg,IDC_KET,_T("10"));

-	SetDlgItemText(hDlg,IDC_OKT,_T("2"));

-

-	SendMessage(GetDlgItem(hDlg,IDC_SFT),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_SOM),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_ASI),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_MCD),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_SCM),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_DGP),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_AIP),BM_SETCHECK,BST_UNCHECKED,0L);

-	SendMessage(GetDlgItem(hDlg,IDC_MCM),BM_SETCHECK,BST_UNCHECKED,0L);

+	SetDlgItemText(hDlg, IDC_KET, _T("10"));

+	SetDlgItemText(hDlg, IDC_OKT, _T("2"));

+

+	SendMessage(GetDlgItem(hDlg, IDC_SFT), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_SOM), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_ASI), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_MCD), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_SCM), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_DGP), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_AIP), BM_SETCHECK, BST_UNCHECKED, 0L);

+	SendMessage(GetDlgItem(hDlg, IDC_MCM), BM_SETCHECK, BST_UNCHECKED, 0L);

 

 	// rebuild list of contacts

-	HWND hLV = GetDlgItem(hDlg,IDC_STD_USERLIST);

+	HWND hLV = GetDlgItem(hDlg, IDC_STD_USERLIST);

 	ListView_DeleteAllItems(hLV);

 

-	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LVITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

 	char tmp[NAMSIZE];

@@ -1183,8 +1181,8 @@ void ResetGeneralDlg(HWND hDlg)
 		pUinKey ptr = getUinKey(hContact);

 		if (!ptr) continue;

 

-		ptr->tmode=MODE_NATIVE;

-		ptr->tstatus=STATUS_ENABLED;

+		ptr->tmode = MODE_NATIVE;

+		ptr->tstatus = STATUS_ENABLED;

 

 		lvi.iItem++;

 		lvi.iImage = ptr->tstatus;

@@ -1199,7 +1197,7 @@ void ResetGeneralDlg(HWND hDlg)
 

 		setListViewMode(hLV, itemNum, ptr->tmode);

 		setListViewStatus(hLV, itemNum, ptr->tstatus);

-		if (ptr->mode == MODE_NATIVE )	setListViewPSK(hLV, itemNum, 0);

+		if (ptr->mode == MODE_NATIVE)	setListViewPSK(hLV, itemNum, 0);

 		else				setListViewPUB(hLV, itemNum, 0);

 		setListViewIcon(hLV, itemNum, ptr);

 	}

@@ -1212,57 +1210,57 @@ void ResetGeneralDlg(HWND hDlg)
 void ApplyGeneralSettings(HWND hDlg)

 {

 	char timeout[5];

-	int tmp,i;

+	int tmp, i;

 

 	// Key Exchange Timeout

-	GetDlgItemText(hDlg,IDC_KET,timeout,5);

+	GetDlgItemText(hDlg, IDC_KET, timeout, 5);

 	tmp = atoi(timeout); if (tmp > 65535) tmp = 65535;

-	db_set_w(0,MODULENAME,"ket",tmp);

-	exp->rsa_set_timeout( db_get_w(0,MODULENAME,"ket",10));

-	mir_itoa(tmp,timeout,10);

-	SetDlgItemText(hDlg,IDC_KET,timeout);

+	db_set_w(0, MODULENAME, "ket", tmp);

+	exp->rsa_set_timeout(db_get_w(0, MODULENAME, "ket", 10));

+	mir_itoa(tmp, timeout, 10);

+	SetDlgItemText(hDlg, IDC_KET, timeout);

 

 	// Offline Key Timeout

-	GetDlgItemText(hDlg,IDC_OKT,timeout,5);

+	GetDlgItemText(hDlg, IDC_OKT, timeout, 5);

 	tmp = atoi(timeout); if (tmp > 65535) tmp = 65535;

-	db_set_w(0,MODULENAME,"okt",tmp);

-	mir_itoa(tmp,timeout,10);

-	SetDlgItemText(hDlg,IDC_OKT,timeout);

-

-	bSFT = (SendMessage(GetDlgItem(hDlg, IDC_SFT),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bSOM = (SendMessage(GetDlgItem(hDlg, IDC_SOM),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bASI = (SendMessage(GetDlgItem(hDlg, IDC_ASI),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bMCD = (SendMessage(GetDlgItem(hDlg, IDC_MCD),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bSCM = (SendMessage(GetDlgItem(hDlg, IDC_SCM),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bDGP = (SendMessage(GetDlgItem(hDlg, IDC_DGP),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bAIP = (SendMessage(GetDlgItem(hDlg, IDC_AIP),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bNOL = (SendMessage(GetDlgItem(hDlg, IDC_NOL),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bAAK = (SendMessage(GetDlgItem(hDlg, IDC_AAK),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	bMCM = (SendMessage(GetDlgItem(hDlg, IDC_MCM),BM_GETCHECK,0L,0L) == BST_CHECKED);

+	db_set_w(0, MODULENAME, "okt", tmp);

+	mir_itoa(tmp, timeout, 10);

+	SetDlgItemText(hDlg, IDC_OKT, timeout);

+

+	bSFT = (SendMessage(GetDlgItem(hDlg, IDC_SFT), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bSOM = (SendMessage(GetDlgItem(hDlg, IDC_SOM), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bASI = (SendMessage(GetDlgItem(hDlg, IDC_ASI), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bMCD = (SendMessage(GetDlgItem(hDlg, IDC_MCD), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bSCM = (SendMessage(GetDlgItem(hDlg, IDC_SCM), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bDGP = (SendMessage(GetDlgItem(hDlg, IDC_DGP), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bAIP = (SendMessage(GetDlgItem(hDlg, IDC_AIP), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bNOL = (SendMessage(GetDlgItem(hDlg, IDC_NOL), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bAAK = (SendMessage(GetDlgItem(hDlg, IDC_AAK), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	bMCM = (SendMessage(GetDlgItem(hDlg, IDC_MCM), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

 

 	SetFlags();

 

 	// PGP &| GPG flags

 	{

 		tmp = 0;

-		i = SendMessage(GetDlgItem(hDlg, IDC_PGP),BM_GETCHECK,0L,0L) == BST_CHECKED;

+		i = SendMessage(GetDlgItem(hDlg, IDC_PGP), BM_GETCHECK, 0L, 0L) == BST_CHECKED;

 		if (i != bPGP) {

 			bPGP = i; tmp++;

 			db_set_b(0, MODULENAME, "pgp", bPGP);

 		}

-		i = SendMessage(GetDlgItem(hDlg, IDC_GPG),BM_GETCHECK,0L,0L) == BST_CHECKED;

+		i = SendMessage(GetDlgItem(hDlg, IDC_GPG), BM_GETCHECK, 0L, 0L) == BST_CHECKED;

 		if (i != bGPG) {

 			bGPG = i; tmp++;

 			db_set_b(0, MODULENAME, "gpg", bGPG);

 		}

-		if (tmp) msgbox1(hDlg, sim224, MODULENAME, MB_OK|MB_ICONINFORMATION);

+		if (tmp) msgbox1(hDlg, sim224, MODULENAME, MB_OK | MB_ICONINFORMATION);

 	}

 

-	HWND hLV = GetDlgItem(hDlg,IDC_STD_USERLIST);

-	i = ListView_GetNextItem(hLV,(UINT)-1,LVNI_ALL);

-	while(i != -1) {

-		pUinKey ptr = (pUinKey)getListViewParam(hLV,i);

-		if (!ptr ) continue;

+	HWND hLV = GetDlgItem(hDlg, IDC_STD_USERLIST);

+	i = ListView_GetNextItem(hLV, (UINT)-1, LVNI_ALL);

+	while (i != -1) {

+		pUinKey ptr = (pUinKey)getListViewParam(hLV, i);

+		if (!ptr) continue;

 		if (ptr->mode != ptr->tmode) {

 			ptr->mode = ptr->tmode;

 			db_set_b(ptr->hContact, MODULENAME, "mode", ptr->mode);

@@ -1273,8 +1271,8 @@ void ApplyGeneralSettings(HWND hDlg)
 			else 				db_set_b(ptr->hContact, MODULENAME, "StatusID", ptr->status);

 		}

 		if (ptr->mode == MODE_NATIVE) {

-			if (getListViewPSK(hLV,i)) {

-				LPSTR tmp = db_get_sa(ptr->hContact,MODULENAME,"tPSK");

+			if (getListViewPSK(hLV, i)) {

+				LPSTR tmp = db_get_sa(ptr->hContact, MODULENAME, "tPSK");

 				db_set_s(ptr->hContact, MODULENAME, "PSK", tmp);

 				mir_free(tmp);

 			}

@@ -1283,45 +1281,45 @@ void ApplyGeneralSettings(HWND hDlg)
 			db_unset(ptr->hContact, MODULENAME, "tPSK");

 		}

 		else if (ptr->mode == MODE_RSAAES) {

-			if (!getListViewPUB(hLV,i))

+			if (!getListViewPUB(hLV, i))

 				db_unset(ptr->hContact, MODULENAME, "rsa_pub");

 		}

-		i = ListView_GetNextItem(hLV,i,LVNI_ALL);

+		i = ListView_GetNextItem(hLV, i, LVNI_ALL);

 	}

 }

 

 void ApplyProtoSettings(HWND hDlg)

 {

-	LPSTR szNames = (LPSTR) alloca(2048); *szNames = '\0';

+	LPSTR szNames = (LPSTR)alloca(2048); *szNames = '\0';

 

-	HWND hLV = GetDlgItem(hDlg,IDC_PROTO);

-	int i = ListView_GetNextItem(hLV,(UINT)-1,LVNI_ALL);

-	while(i != -1) {

-		pSupPro p =  arProto[ getListViewProto(hLV,i) ];

-		p->inspecting = ListView_GetCheckState(hLV,i);

+	HWND hLV = GetDlgItem(hDlg, IDC_PROTO);

+	int i = ListView_GetNextItem(hLV, (UINT)-1, LVNI_ALL);

+	while (i != -1) {

+		pSupPro p = arProto[getListViewProto(hLV, i)];

+		p->inspecting = ListView_GetCheckState(hLV, i);

 		char tmp[128];

 		mir_snprintf(tmp, SIZEOF(tmp), "%s:%d:%d:%d;", p->name, p->inspecting, p->tsplit_on, p->tsplit_off);

 		strcat(szNames, tmp);

 		p->split_on = p->tsplit_on;

 		p->split_off = p->tsplit_off;

-		i = ListView_GetNextItem(hLV,i,LVNI_ALL);

+		i = ListView_GetNextItem(hLV, i, LVNI_ALL);

 	}

 

-	db_set_s(0,MODULENAME,"protos",szNames);

+	db_set_s(0, MODULENAME, "protos", szNames);

 }

 

 void ApplyPGPSettings(HWND hDlg)

 {

-	bUseKeyrings = !(SendMessage(GetDlgItem(hDlg, IDC_NO_KEYRINGS),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	db_set_b(0,MODULENAME,"ukr",bUseKeyrings);

+	bUseKeyrings = !(SendMessage(GetDlgItem(hDlg, IDC_NO_KEYRINGS), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	db_set_b(0, MODULENAME, "ukr", bUseKeyrings);

 

-	char *priv = db_get_sa(0,MODULENAME,"tpgpPrivKey");

+	char *priv = db_get_sa(0, MODULENAME, "tpgpPrivKey");

 	if (priv) {

 		bPGPprivkey = true;

 		pgp_set_priv_key(priv);

-		db_set_s(0,MODULENAME,"pgpPrivKey",priv);

+		db_set_s(0, MODULENAME, "pgpPrivKey", priv);

 		mir_free(priv);

-		db_unset(0,MODULENAME,"tpgpPrivKey");

+		db_unset(0, MODULENAME, "tpgpPrivKey");

 	}

 }

 

@@ -1330,39 +1328,39 @@ void ApplyGPGSettings(HWND hDlg)
 	char tmp[256];

 

 	GetDlgItemText(hDlg, IDC_GPGEXECUTABLE_EDIT, tmp, sizeof(tmp));

-	db_set_s(0,MODULENAME,"gpgExec",tmp);

+	db_set_s(0, MODULENAME, "gpgExec", tmp);

 	GetDlgItemText(hDlg, IDC_GPGHOME_EDIT, tmp, sizeof(tmp));

-	db_set_s(0,MODULENAME,"gpgHome",tmp);

+	db_set_s(0, MODULENAME, "gpgHome", tmp);

 

-	bSavePass = (SendMessage(GetDlgItem(hDlg, IDC_SAVEPASS_CBOX),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	db_set_b(0,MODULENAME,"gpgSaveFlag",bSavePass);

+	bSavePass = (SendMessage(GetDlgItem(hDlg, IDC_SAVEPASS_CBOX), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	db_set_b(0, MODULENAME, "gpgSaveFlag", bSavePass);

 

-	BOOL bgpgLogFlag = (SendMessage(GetDlgItem(hDlg, IDC_LOGGINGON_CBOX),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	db_set_b(0,MODULENAME,"gpgLogFlag",bgpgLogFlag);

+	BOOL bgpgLogFlag = (SendMessage(GetDlgItem(hDlg, IDC_LOGGINGON_CBOX), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	db_set_b(0, MODULENAME, "gpgLogFlag", bgpgLogFlag);

 	GetDlgItemText(hDlg, IDC_GPGLOGFILE_EDIT, tmp, sizeof(tmp));

-	db_set_s(0,MODULENAME,"gpgLog",tmp);

+	db_set_s(0, MODULENAME, "gpgLog", tmp);

 	if (bgpgLogFlag)	gpg_set_log(tmp);

 	else gpg_set_log(0);

 

-	BOOL bgpgTmpFlag = (SendMessage(GetDlgItem(hDlg, IDC_TMPPATHON_CBOX),BM_GETCHECK,0L,0L) == BST_CHECKED);

-	db_set_b(0,MODULENAME,"gpgTmpFlag",bgpgTmpFlag);

+	BOOL bgpgTmpFlag = (SendMessage(GetDlgItem(hDlg, IDC_TMPPATHON_CBOX), BM_GETCHECK, 0L, 0L) == BST_CHECKED);

+	db_set_b(0, MODULENAME, "gpgTmpFlag", bgpgTmpFlag);

 	GetDlgItemText(hDlg, IDC_GPGTMPPATH_EDIT, tmp, sizeof(tmp));

-	db_set_s(0,MODULENAME,"gpgTmp",tmp);

+	db_set_s(0, MODULENAME, "gpgTmp", tmp);

 	if (bgpgTmpFlag)	gpg_set_tmp(tmp);

 	else gpg_set_tmp(0);

 

-	HWND hLV = GetDlgItem(hDlg,IDC_GPG_USERLIST);

-	int i = ListView_GetNextItem(hLV,(UINT)-1,LVNI_ALL);

-	while(i != -1) {

-		pUinKey ptr = (pUinKey)getListViewParam(hLV,i);

-		if (!ptr ) continue;

+	HWND hLV = GetDlgItem(hDlg, IDC_GPG_USERLIST);

+	int i = ListView_GetNextItem(hLV, (UINT)-1, LVNI_ALL);

+	while (i != -1) {

+		pUinKey ptr = (pUinKey)getListViewParam(hLV, i);

+		if (!ptr) continue;

 		if (ptr->gpgMode != ptr->tgpgMode) {

 			ptr->gpgMode = ptr->tgpgMode;

-			if (ptr->gpgMode )	db_set_b(ptr->hContact,MODULENAME,"gpgANSI",1);

-			else              	db_unset(ptr->hContact,MODULENAME,"gpgANSI");

-		}			

+			if (ptr->gpgMode)	db_set_b(ptr->hContact, MODULENAME, "gpgANSI", 1);

+			else              	db_unset(ptr->hContact, MODULENAME, "gpgANSI");

+		}

 

-		i = ListView_GetNextItem(hLV,i,LVNI_ALL);

+		i = ListView_GetNextItem(hLV, i, LVNI_ALL);

 	}

 }

 

@@ -1372,7 +1370,7 @@ void ApplyGPGSettings(HWND hDlg)
 

 LPARAM getListViewParam(HWND hLV, UINT iItem)

 {

-	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LVITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.iItem = iItem;

 	lvi.mask = LVIF_PARAM;

 	ListView_GetItem(hLV, &lvi);

@@ -1381,12 +1379,12 @@ LPARAM getListViewParam(HWND hLV, UINT iItem)
 

 void setListViewIcon(HWND hLV, UINT iItem, pUinKey ptr)

 {

-	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

+	LVITEM lvi; memset(&lvi, 0, sizeof(lvi));

 	lvi.iItem = iItem;

-	switch(ptr->tmode) {

+	switch (ptr->tmode) {

 	case MODE_NATIVE:

 	case MODE_RSAAES:

-		lvi.iImage = ICO_ST_DIS+ptr->tstatus;

+		lvi.iImage = ICO_ST_DIS + ptr->tstatus;

 		break;

 	case MODE_PGP:

 		lvi.iImage = ICO_OV_PGP;

@@ -1423,7 +1421,7 @@ UINT getListViewPSK(HWND hLV, UINT iItem)
 void setListViewPSK(HWND hLV, UINT iItem, UINT iStatus)

 {

 	char str[128];

-	strncpy(str, (iStatus)?Translate(sim206):"-", sizeof(str));

+	strncpy(str, (iStatus) ? Translate(sim206) : "-", sizeof(str));

 	LV_SetItemTextA(hLV, iItem, 4, str);

 }

 

@@ -1437,18 +1435,18 @@ UINT getListViewPUB(HWND hLV, UINT iItem)
 void setListViewPUB(HWND hLV, UINT iItem, UINT iStatus)

 {

 	char str[128];

-	strncpy(str, (iStatus)?Translate(sim233):"-", sizeof(str));

+	strncpy(str, (iStatus) ? Translate(sim233) : "-", sizeof(str));

 	LV_SetItemTextA(hLV, iItem, 4, str);

 

 	LPSTR sha = NULL;

 	if (iStatus) {

 		DBVARIANT dbv;

 		dbv.type = DBVT_BLOB;

-		pUinKey ptr = (pUinKey) getListViewParam(hLV, iItem);

-		if (db_get(ptr->hContact,MODULENAME,"rsa_pub",&dbv) == 0) {

+		pUinKey ptr = (pUinKey)getListViewParam(hLV, iItem);

+		if (db_get(ptr->hContact, MODULENAME, "rsa_pub", &dbv) == 0) {

 			int len;

-			exp->rsa_get_hash((PBYTE)dbv.pbVal,dbv.cpbVal,(PBYTE)str,&len);

-			sha = mir_strdup(to_hex((PBYTE)str,len));

+			exp->rsa_get_hash((PBYTE)dbv.pbVal, dbv.cpbVal, (PBYTE)str, &len);

+			sha = mir_strdup(to_hex((PBYTE)str, len));

 			db_free(&dbv);

 		}

 	}

@@ -1463,7 +1461,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
 {

 	pUinKey p1 = pUinKey(lParam1), p2 = pUinKey(lParam2);

 	char t1[NAMSIZE], t2[NAMSIZE];

-	int s,d,m=1;

+	int s, d, m = 1;

 	DBVARIANT dbv1 = { 0 }, dbv2 = { 0 };

 

 	if (lParamSort & 0x100) {

@@ -1471,74 +1469,73 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
 		m = -1;

 	}

 

-	switch(lParamSort){

+	switch (lParamSort) {

 	case 0x01:

 	case 0x11:

 	case 0x21:

 		getContactNameA(p1->hContact, t1);

 		getContactNameA(p2->hContact, t2);

-		return strncmp(t1,t2,NAMSIZE)*m;

+		return strncmp(t1, t2, NAMSIZE)*m;

 

 	case 0x02:

 	case 0x12:

 	case 0x22:

 		getContactUinA(p1->hContact, t1);

 		getContactUinA(p2->hContact, t2);

-		return strncmp(t1,t2,NAMSIZE)*m;

+		return strncmp(t1, t2, NAMSIZE)*m;

 

 	case 0x03:

 		s = p1->tmode;

 		d = p2->tmode;

-		return (s-d)*m;

+		return (s - d)*m;

 

 	case 0x13:

-		db_get_s(p1->hContact,MODULENAME,"pgp_abbr",&dbv1);

-		db_get_s(p2->hContact,MODULENAME,"pgp_abbr",&dbv2);

-		s=(dbv1.type == DBVT_ASCIIZ);

-		d=(dbv2.type == DBVT_ASCIIZ);

+		db_get_s(p1->hContact, MODULENAME, "pgp_abbr", &dbv1);

+		db_get_s(p2->hContact, MODULENAME, "pgp_abbr", &dbv2);

+		s = (dbv1.type == DBVT_ASCIIZ);

+		d = (dbv2.type == DBVT_ASCIIZ);

 		if (s && d) {

-			s=strcmp(dbv1.pszVal,dbv2.pszVal);

-			d=0;

+			s = strcmp(dbv1.pszVal, dbv2.pszVal);

+			d = 0;

 		}

 		db_free(&dbv1);

 		db_free(&dbv2);

-		return (s-d)*m;

+		return (s - d)*m;

 

 	case 0x23:

-		db_get_s(p1->hContact,MODULENAME,"gpg",&dbv1);

-		db_get_s(p2->hContact,MODULENAME,"gpg",&dbv2);

+		db_get_s(p1->hContact, MODULENAME, "gpg", &dbv1);

+		db_get_s(p2->hContact, MODULENAME, "gpg", &dbv2);

 		s = (dbv1.type == DBVT_ASCIIZ);

 		d = (dbv2.type == DBVT_ASCIIZ);

 		if (s && d) {

-			s = strcmp(dbv1.pszVal,dbv2.pszVal);

+			s = strcmp(dbv1.pszVal, dbv2.pszVal);

 			d = 0;

 		}

 		db_free(&dbv1);

 		db_free(&dbv2);

-		return (s-d)*m;

+		return (s - d)*m;

 

 	case 0x04:

 		s = p1->tstatus;

 		d = p2->tstatus;

-		return (s-d)*m;

+		return (s - d)*m;

 

 	case 0x05:

-		db_get_s(p1->hContact,MODULENAME,"PSK",&dbv1);

-		s=(dbv1.type == DBVT_ASCIIZ);

+		db_get_s(p1->hContact, MODULENAME, "PSK", &dbv1);

+		s = (dbv1.type == DBVT_ASCIIZ);

 		db_free(&dbv1);

-		db_get_s(p2->hContact,MODULENAME,"PSK",&dbv2);

-		d=(dbv2.type == DBVT_ASCIIZ);

+		db_get_s(p2->hContact, MODULENAME, "PSK", &dbv2);

+		d = (dbv2.type == DBVT_ASCIIZ);

 		db_free(&dbv2);

-		return (s-d)*m;

+		return (s - d)*m;

 	}

 	return 0;

 }

 

 void ListView_Sort(HWND hLV, LPARAM lParamSort)

 {

-	char t[32];

-

 	// restore sort column

+	char t[32];

 	mir_snprintf(t, SIZEOF(t), "os%02x", (UINT)lParamSort & 0xF0);

 	if ((lParamSort & 0x0F) == 0)

 		lParamSort = (int)db_get_b(0, MODULENAME, t, lParamSort + 1);

@@ -1548,9 +1545,9 @@ void ListView_Sort(HWND hLV, LPARAM lParamSort)
 	// restore sort order

 	mir_snprintf(t, SIZEOF(t), "os%02x", (UINT)lParamSort);

 	int m = db_get_b(0, MODULENAME, t, 0);

-	if (bChangeSortOrder){ m=!m; db_set_b(0, MODULENAME, t, m); }

+	if (bChangeSortOrder) { m = !m; db_set_b(0, MODULENAME, t, m); }

 

-	ListView_SortItems(hLV,&CompareFunc,lParamSort|(m<<8));

+	ListView_SortItems(hLV, &CompareFunc, lParamSort | (m << 8));

 }

 

 BOOL ShowSelectKeyDlg(HWND hParent, LPSTR KeyPath)

@@ -1570,22 +1567,21 @@ BOOL ShowSelectKeyDlg(HWND hParent, LPSTR KeyPath)
 	return TRUE;

 }

 

-

 LPCSTR priv_beg = "-----BEGIN PGP PRIVATE KEY BLOCK-----";

 LPCSTR priv_end = "-----END PGP PRIVATE KEY BLOCK-----";

 LPCSTR publ_beg = "-----BEGIN PGP PUBLIC KEY BLOCK-----";

 LPCSTR publ_end = "-----END PGP PUBLIC KEY BLOCK-----";

 

-LPSTR LoadKeys(LPCSTR file,BOOL priv)

+LPSTR LoadKeys(LPCSTR file, BOOL priv)

 {

-	FILE *f=fopen(file,"r");

+	FILE *f = fopen(file, "r");

 	if (!f) return NULL;

 

-	fseek(f,0,SEEK_END);

+	fseek(f, 0, SEEK_END);

 	int flen = ftell(f);

-	fseek(f,0,SEEK_SET);

+	fseek(f, 0, SEEK_SET);

 

-	LPCSTR beg,end;

+	LPCSTR beg, end;

 	if (priv) {

 		beg = priv_beg;

 		end = priv_end;

@@ -1595,26 +1591,26 @@ LPSTR LoadKeys(LPCSTR file,BOOL priv)
 		end = publ_end;

 	}

 

-	LPSTR keys = (LPSTR)mir_alloc(flen+1);

-	int i=0; BOOL b=false;

-	while(fgets(keys+i,128,f)) {

-		if (!b && strncmp(keys+i,beg,strlen(beg)) == 0)

-			b=true;

-		else if (b && strncmp(keys+i,end,strlen(end)) == 0) {

-			i+=(int)strlen(keys+i);

-			b=false;

+	LPSTR keys = (LPSTR)mir_alloc(flen + 1);

+	int i = 0; BOOL b = false;

+	while (fgets(keys + i, 128, f)) {

+		if (!b && strncmp(keys + i, beg, strlen(beg)) == 0)

+			b = true;

+		else if (b && strncmp(keys + i, end, strlen(end)) == 0) {

+			i += (int)strlen(keys + i);

+			b = false;

 		}

 		if (b)

-			i+=(int)strlen(keys+i);

+			i += (int)strlen(keys + i);

 	}

-	*(keys+i)='\0';

+	*(keys + i) = '\0';

 	fclose(f);

 	return keys;

 }

 

 BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)

 {

-	TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc"); 

+	TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc");

 	if (priv)

 		_tcscpy(szFile, _T("rsa_priv.asc"));

 

@@ -1642,11 +1638,11 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 

 BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)

 {

-	TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc"); 

+	TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc");

 	if (priv)

 		_tcscpy(szFile, _T("rsa_priv.asc"));

 

-	OPENFILENAME ofn = {0};

+	OPENFILENAME ofn = { 0 };

 	ofn.lStructSize = sizeof(ofn);

 	ofn.hwndOwner = hParent;

 	ofn.nMaxFile = MAX_PATH;

@@ -1687,5 +1683,3 @@ int onRegisterOptions(WPARAM wParam, LPARAM)
 	Options_AddPage(wParam, &odp);

 	return 0;

 }

-

-// EOF