modified: commonheaders.h

	modified:   main.cpp
	new file:   new_gpg.icproj
	modified:   new_gpg.rc
	modified:   new_gpg.sln
	modified:   new_gpg.vcproj
	modified:   options.cpp
	modified:   resource.h
	modified:   utilities.cpp

9 files changed, 597 insertions, 488 deletions

diff --git a/commonheaders.h b/commonheaders.h
index 8760d93..39e128f 100644
--- a/commonheaders.h
+++ b/commonheaders.h
@@ -19,7 +19,16 @@
 #include <locale.h>
 #include <shlobj.h>
 
+#include <iostream>
 #include <map>
+using std::map;
+#include <list>
+using std::list;
+#include <string>
+using std::string;
+using std::wstring;
+#include <fstream>
+using std::wfstream;
 
 #define MIRANDA_VER 0x0801
 
diff --git a/main.cpp b/main.cpp
index 63735bf..783ba52 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,8 +27,17 @@ int gpg_init()
 #ifdef LC_MESSAGES

 	gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));

 #endif
-	gpgme_protocol_t proto = GPGME_PROTOCOL_UNKNOWN;
+	gpgme_error_t err;
 	gpgme_ctx_t ctx;
-	gpgme_new(&ctx);
+	err = gpgme_new(&ctx);
+	TCHAR error[128];
+	mir_sntprintf(error, 128, _T("%d"), error);
+//	MessageBox(0, error, _T("info"), MB_OK);
+/*	gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
+	char *tmp = mir_t2a(UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("")));
+	char *tmp2 = mir_t2a(UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")));
+	gpgme_ctx_set_engine_info(ctx, proto, tmp, tmp2);
+	mir_free(tmp);
+	mir_free(tmp2); */
 	return 0;
 }
diff --git a/new_gpg.icproj b/new_gpg.icproj
new file mode 100644
index 0000000..1af9561
--- /dev/null
+++ b/new_gpg.icproj
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="windows-1251"?>

+<VisualStudioProject

+	ProjectType="Intel C++ Project"

+	Version="11.1"

+	Name="new_gpg"

+	ProjectGUID="{9AD3350E-D58E-4128-A90D-6DC4C3775198}"

+	VCNestedProjectGUID="{F29D0C8D-141A-43CF-86B2-34A04653F8D4}"

+	VCNestedProjectFileName="new_gpg.vcproj">

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32">

+			<Tool

+				Name="GeneralTool"

+				InterproceduralOptimization="true"/>

+		</Configuration>

+		<Configuration

+			Name="Release Unicode (static)|Win32">

+			<Tool

+				Name="CppCmplrTool"

+				GlobalOptimizations="true"

+				OptimizeForWindowsApplication="true"

+				EnableEnhancedInstructionSet="1001"

+				FloatingPointModel="1000"/>

+		</Configuration>

+	</Configurations>

+	<Files/>

+</VisualStudioProject>

diff --git a/new_gpg.rc b/new_gpg.rc
index 14f7b6a..d60bec2 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -58,8 +58,8 @@ CAPTION "Load Public GPG key"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "ÎÊ",ID_OK,7,63,50,14

-    PUSHBUTTON      "Load from file",ID_LOD_FROM_FILE,208,63,54,14

-    EDITTEXT        IDC_PUBLIC_KEY_EDIT,7,7,255,51,ES_AUTOHSCROLL

+    PUSHBUTTON      "Load from file",ID_LOAD_FROM_FILE,208,63,54,14

+    EDITTEXT        IDC_PUBLIC_KEY_EDIT,7,7,255,51,ES_MULTILINE | ES_AUTOHSCROLL | WS_VSCROLL,WS_EX_STATICEDGE

 END

 

 

@@ -105,7 +105,9 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN

     CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,254,112

     CTEXT           "Userlist:",IDC_STATIC,25,7,201,8

-    PUSHBUTTON      "Set PubKey",IDC_LOAD_KEY_BUTTON,7,135,49,14

+    PUSHBUTTON      "Import PubKey",IDC_LOAD_KEY_BUTTON,7,135,54,14

+    PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,64,135,54,14

+    PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,121,135,50,14

 END

 

 IDD_OPT_GPG_BIN DIALOGEX 0, 0, 268, 214

diff --git a/new_gpg.sln b/new_gpg.sln
index ee44b6f..a32e3e6 100644
--- a/new_gpg.sln
+++ b/new_gpg.sln
@@ -1,23 +1,38 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "new_gpg", "new_gpg.vcproj", "{F29D0C8D-141A-43CF-86B2-34A04653F8D4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release Unicode (static)|Win32 = Release Unicode (static)|Win32
-		Release Unicode|Win32 = Release Unicode|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.Build.0 = Debug|Win32
-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|Win32
-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.Build.0 = Release Unicode (static)|Win32
-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "new_gpg", "new_gpg.icproj", "{9AD3350E-D58E-4128-A90D-6DC4C3775198}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug(service)|Win32 = Debug(service)|Win32

+		Debug|Win32 = Debug|Win32

+		Release Unicode (service only)(static)|Win32 = Release Unicode (service only)(static)|Win32

+		Release Unicode (service only)|Win32 = Release Unicode (service only)|Win32

+		Release Unicode (static)|Win32 = Release Unicode (static)|Win32

+		Release Unicode|Win32 = Release Unicode|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Debug(service)|Win32.ActiveCfg = Debug(service)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Debug(service)|Win32.Build.0 = Debug(service)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Debug|Win32.ActiveCfg = Debug|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Debug|Win32.Build.0 = Debug|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode (service only)(static)|Win32.ActiveCfg = Release Unicode (service only)(static)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode (service only)(static)|Win32.Build.0 = Release Unicode (service only)(static)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode (service only)|Win32.ActiveCfg = Release Unicode (service only)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode (service only)|Win32.Build.0 = Release Unicode (service only)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode (static)|Win32.Build.0 = Release Unicode (static)|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{9AD3350E-D58E-4128-A90D-6DC4C3775198}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|Win32.ActiveCfg = Debug(service)|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|Win32.ActiveCfg = Release Unicode (service only)(static)|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)|Win32.ActiveCfg = Release Unicode (service only)|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/new_gpg.vcproj b/new_gpg.vcproj
index 4361722..b09872b 100644
--- a/new_gpg.vcproj
+++ b/new_gpg.vcproj
@@ -282,6 +282,7 @@
 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="X:\install\git\miranda\mim_plugs\lib"

 				GenerateDebugInformation="false"

+				SubSystem="0"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				LinkTimeCodeGeneration="1"

diff --git a/options.cpp b/options.cpp
index cf0b75f..772d2d4 100644
--- a/options.cpp
+++ b/options.cpp
@@ -1,286 +1,327 @@
-// Copyright © 2010 sss
-// 
-// This program is free software; you can redistribute it and/or
-// 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,
-// 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.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-#include <uxtheme.h>
-
-extern HINSTANCE hInst;
-
-static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-
-int GpgOptInit(WPARAM wParam,LPARAM lParam)
-{
-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);
-	odp.pszTitle = szModuleName;
-	odp.pszGroup = "Services";
-	odp.pszTab = "Main";
-	odp.flags=ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = DlgProcGpgOpts;
-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
-
-	ZeroMemory(&odp, sizeof(odp));
-
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN);
-	odp.pszTitle = szModuleName;
-	odp.pszGroup = "Services";
-	odp.pszTab = "GnuPG Variables";
-	odp.flags=ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = DlgProcGpgBinOpts;
-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
-
-	return 0;
-}
-
-static HWND hwndLoadPublicKey = NULL;
-
-std::map<int, HANDLE> user_data;
-
-int item_num = 0;
-HWND hwndList_p;
-
-void ShowLoadPublicKeyDialog();
-static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	HWND hwndList=GetDlgItem(hwndDlg, IDC_USERLIST);
-	hwndList_p = hwndList;
-	LVCOLUMN col;
-	LVITEM item;
-	NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		col.pszText = _T("Contact");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 100;
-		ListView_InsertColumn(hwndList, 0, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Protocol");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 1, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("PubKey");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 250;
-		ListView_InsertColumn(hwndList, 2, &col);
-		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
-		int i = 1, iRow = 0;
-		for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact != NULL; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
-		{
-			TCHAR *name = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
-			item.mask = LVIF_TEXT;
-			item.iItem = i;
-			item.iSubItem = 0;
-			item.pszText = name;
-			iRow = ListView_InsertItem(hwndList, &item);
-			ListView_SetItemText(hwndList, iRow, 0, name);
-			TCHAR *tmp = mir_a2t((char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0));
-			ListView_SetItemText(hwndList, iRow, 1, tmp);
-			mir_free(tmp);
-			tmp = UniGetContactSettingUtf(hContact, szModuleName, "GPGPubKey", _T("not set"));
-			ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set"));
-			if(DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0))
-				ListView_SetItemState(hwndList, iRow, 0x2000, 0xF000);
-			user_data[i] = hContact;
-			ZeroMemory(&item,sizeof(item));
-			i++;
-		}
-		ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this
-		ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);
-		ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_LOAD_KEY_BUTTON:
-		  ShowLoadPublicKeyDialog();
-		  return TRUE;
-	  default:
-		break;
-      }
-      
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-		if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
-		{
-			if(hdr->hdr.code == LVN_ITEMCHANGED)
-			{
-				int i = hdr->iItem;
-				HANDLE hContact = user_data[i+1];
-				if(ListView_GetItemState(hwndList, i, 0xF000) == 0x2000)
-					DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 1);
-				else
-					DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);
-				item_num = hdr->iItem;
-			}
-		}
-		switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-          return TRUE;
-        }
-      }
-    }
-    break;
-  }
-
-  return FALSE;
-}
-
-
-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		SetDlgItemText(hwndDlg, IDC_BIN_PATH, UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("gpg2.exe")));
-		SetDlgItemText(hwndDlg, IDC_HOME_DIR, UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("gpg")));
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_SET_BIN_PATH:
-		  GetFilePath(_T("Choose gpg2.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables"));
-		  SetDlgItemText(hwndDlg, IDC_BIN_PATH, UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("gpg2.exe")));
-		  break;
-	  case IDC_SET_HOME_DIR:
-		  GetFolderPath(_T("Set home diractory"), "szHomePath");
-		  SetDlgItemText(hwndDlg, IDC_HOME_DIR, UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")));
-		  break;
-	  default:
-		break;
-      }
-      
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-		  TCHAR tmp[512];
-		  GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512);
-		  DBWriteContactSettingTString(NULL, szModuleName, "szGpgBinPath", tmp);
-		  GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);
-		  DBWriteContactSettingTString(NULL, szModuleName, "szHomePath", tmp);
-          return TRUE;
-        }
-      }
-	}
-    break;
-  }
-  return FALSE;
-}
-
-static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-	HANDLE hContact = user_data[item_num+1];
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		TCHAR *tmp = UniGetContactSettingUtf(hContact, szModuleName, "GPGPubKey", _T(""));
-		SetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, (_tcslen(tmp) > 1)?tmp:_T(""));
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case ID_OK:
-		  TCHAR tmp[1024];
-		  GetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, tmp, 1024);
-		  DBWriteContactSettingTString(hContact, szModuleName, "GPGPubKey", tmp);
-		  ListView_SetItemText(hwndList_p, item_num, 2, (_tcslen(tmp) > 1)?tmp:_T("not set"));
-		  DestroyWindow(hwndDlg);
-		  break;
-	  case ID_LOD_FROM_FILE:
-		  TCHAR *tmp2 = GetFilePath(_T("Set file containing GPG public key"), _T("*"), _T("GPG public key file"));
-		  MessageBox(0, tmp2, _T("i will parse"), MB_OK);
-		  delete tmp2;
-		  break;
-      }
-      
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-          return TRUE;
-        }
-      }
-	}
-	break;
-	case WM_CLOSE:
-		DestroyWindow(hwndDlg);
-		break;
-	case WM_DESTROY:
-		hwndLoadPublicKey = NULL;
-		break;
-
-  }
-
-  return FALSE;
-}
-
-void ShowLoadPublicKeyDialog()
-{
-	if (hwndLoadPublicKey == NULL)
-	{
-		hwndLoadPublicKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, DlgProcLoadPublicKey);
-	}
-	SetForegroundWindow(hwndLoadPublicKey);
-}
+// Copyright © 2010 sss

+// 

+// This program is free software; you can redistribute it and/or

+// 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,

+// 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.

+// 

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+

+#include "commonheaders.h"

+#include <uxtheme.h>

+

+extern HINSTANCE hInst;

+

+static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+

+int GpgOptInit(WPARAM wParam,LPARAM lParam)

+{

+	OPTIONSDIALOGPAGE odp = { 0 };

+	odp.cbSize = sizeof(odp);

+	odp.hInstance = hInst;

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);

+	odp.pszTitle = szModuleName;

+	odp.pszGroup = "Services";

+	odp.pszTab = "Main";

+	odp.flags=ODPF_BOLDGROUPS;

+	odp.pfnDlgProc = DlgProcGpgOpts;

+	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+

+	ZeroMemory(&odp, sizeof(odp));

+

+	odp.cbSize = sizeof(odp);

+	odp.hInstance = hInst;

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN);

+	odp.pszTitle = szModuleName;

+	odp.pszGroup = "Services";

+	odp.pszTab = "GnuPG Variables";

+	odp.flags=ODPF_BOLDGROUPS;

+	odp.pfnDlgProc = DlgProcGpgBinOpts;

+	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+

+	return 0;

+}

+

+static HWND hwndLoadPublicKey = NULL;

+

+map<int, HANDLE> user_data;

+

+int item_num = 0;

+HWND hwndList_p;

+

+void ShowLoadPublicKeyDialog();

+static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+	HWND hwndList=GetDlgItem(hwndDlg, IDC_USERLIST);

+	hwndList_p = hwndList;

+	LVCOLUMN col;

+	LVITEM item;

+	NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;

+  switch (msg)

+  {

+  case WM_INITDIALOG:

+    {

+		TranslateDialogDefault(hwndDlg);

+		col.pszText = _T("Contact");

+		col.mask = LVCF_TEXT | LVCF_WIDTH;

+		col.fmt = LVCFMT_LEFT;

+		col.cx = 100;

+		ListView_InsertColumn(hwndList, 0, &col);

+		ZeroMemory(&col,sizeof(col));

+		col.pszText = _T("Protocol");

+		col.mask = LVCF_TEXT | LVCF_WIDTH;

+		col.fmt = LVCFMT_LEFT;

+		col.cx = 30;

+		ListView_InsertColumn(hwndList, 1, &col);

+		ZeroMemory(&col,sizeof(col));

+		col.pszText = _T("PubKey");

+		col.mask = LVCF_TEXT | LVCF_WIDTH;

+		col.fmt = LVCFMT_LEFT;

+		col.cx = 250;

+		ListView_InsertColumn(hwndList, 2, &col);

+		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);

+		int i = 1, iRow = 0;

+		for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact != NULL; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))

+		{

+			TCHAR *name = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);

+			item.mask = LVIF_TEXT;

+			item.iItem = i;

+			item.iSubItem = 0;

+			item.pszText = name;

+			iRow = ListView_InsertItem(hwndList, &item);

+			ListView_SetItemText(hwndList, iRow, 0, name);

+			TCHAR *tmp = mir_a2t((char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0));

+			ListView_SetItemText(hwndList, iRow, 1, tmp);

+			mir_free(tmp);

+			tmp = UniGetContactSettingUtf(hContact, szModuleName, "GPGPubKey", _T("not set"));

+			ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set"));

+			if(DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0))

+				ListView_SetItemState(hwndList, iRow, 0x2000, 0xF000);

+			user_data[i] = hContact;

+			ZeroMemory(&item,sizeof(item));

+			i++;

+		}

+		ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this

+		ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);

+		ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);

+      return TRUE;

+    }

+    

+ 

+  case WM_COMMAND:

+    {

+      switch (LOWORD(wParam))

+      {

+	  case IDC_LOAD_KEY_BUTTON:

+		  ShowLoadPublicKeyDialog();

+		  return TRUE;

+	  case IDC_SAVE_KEY_BUTTON:

+		  break;

+	  case IDC_DELETE_KEY_BUTTON:

+		  DBDeleteContactSetting(user_data[item_num+1], szModuleName, "GPGPubKey");

+		  ListView_SetItemText(hwndList, item_num, 2, _T("not set"));

+		  break;

+	  default:

+		break;

+      }

+      

+      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+      break;

+    }

+    

+  case WM_NOTIFY:

+    {

+		if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))

+		{

+			if(hdr->hdr.code == LVN_ITEMCHANGED)

+			{

+				int i = hdr->iItem;

+				if(ListView_GetItemState(hwndList, i, 0xF000) == 0x2000)

+					DBWriteContactSettingByte(user_data[i+1], szModuleName, "GPGEncryption", 1);

+				else

+					DBWriteContactSettingByte(user_data[i+1], szModuleName, "GPGEncryption", 0);

+				item_num = hdr->iItem;

+			}

+		}

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

+      {

+        

+      case PSN_APPLY:

+        {

+          return TRUE;

+        }

+      }

+    }

+    break;

+  }

+

+  return FALSE;

+}

+

+

+static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+  switch (msg)

+  {

+  case WM_INITDIALOG:

+    {

+		TranslateDialogDefault(hwndDlg);

+		SetDlgItemText(hwndDlg, IDC_BIN_PATH, UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("gpg2.exe")));

+		SetDlgItemText(hwndDlg, IDC_HOME_DIR, UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("gpg")));

+      return TRUE;

+    }

+    

+ 

+  case WM_COMMAND:

+    {

+      switch (LOWORD(wParam))

+      {

+	  case IDC_SET_BIN_PATH:

+		  GetFilePath(_T("Choose gpg2.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables"));

+		  SetDlgItemText(hwndDlg, IDC_BIN_PATH, UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("gpg2.exe")));

+		  break;

+	  case IDC_SET_HOME_DIR:

+		  GetFolderPath(_T("Set home diractory"), "szHomePath");

+		  SetDlgItemText(hwndDlg, IDC_HOME_DIR, UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")));

+		  break;

+	  default:

+		break;

+      }

+      

+      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+      break;

+    }

+    

+  case WM_NOTIFY:

+    {

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

+      {

+        

+      case PSN_APPLY:

+        {

+		  TCHAR tmp[512];

+		  GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512);

+		  DBWriteContactSettingTString(NULL, szModuleName, "szGpgBinPath", tmp);

+		  GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);

+		  DBWriteContactSettingTString(NULL, szModuleName, "szHomePath", tmp);

+          return TRUE;

+        }

+      }

+	}

+    break;

+  }

+  return FALSE;

+}

+

+static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)

+{

+	HANDLE hContact = user_data[item_num+1];

+

+	TCHAR *tmp = NULL;

+

+	wstring key_buf;

+	wstring::size_type ws1 = 0, ws2 = 0;

+  switch (msg)

+  {

+  case WM_INITDIALOG:

+    {

+		TranslateDialogDefault(hwndDlg);

+		tmp = UniGetContactSettingUtf(hContact, szModuleName, "GPGPubKey", _T(""));

+		SetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, (_tcslen(tmp) > 1)?tmp:_T(""));

+		mir_free(tmp);

+      return TRUE;

+    }

+    

+ 

+  case WM_COMMAND:

+    {

+      switch (LOWORD(wParam))

+      {

+	  case ID_OK:

+		  tmp = new TCHAR [40960];

+		  GetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, tmp, 40960);

+		  key_buf.append(tmp);

+		  delete [] tmp;

+		  if(((ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----"))) == wstring::npos) || ((ws1 = key_buf.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"))) == wstring::npos))

+		  {

+			  MessageBox(0, _T("This is not public key"), _T("INFO"), MB_OK);

+			  break;

+		  }

+		  ws2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));

+		  DBWriteContactSettingTString(hContact, szModuleName, "GPGPubKey", key_buf.substr(ws1,ws2-ws1).c_str());

+		  ListView_SetItemText(hwndList_p, item_num, 2, (TCHAR*)key_buf.substr(ws1,ws2-ws1).c_str());

+		  key_buf.clear();

+		  DestroyWindow(hwndDlg);

+		  break;

+	  case ID_LOAD_FROM_FILE:

+		  tmp = GetFilePath(_T("Set file containing GPG public key"), _T("*"), _T("GPG public key file"));

+		  wfstream f(tmp, std::ios::in);

+		  delete [] tmp;

+		  if(!f.is_open())

+		  {

+			  MessageBox(0, _T("Failed to open file"), _T("Error"), MB_OK);

+			  break;

+		  }

+		  while(!f.eof())

+		  {

+			  tmp = new TCHAR [1024];

+			  f.getline(tmp, 1024, '\n');

+			  key_buf.append(tmp);

+			  key_buf.append(_T("\r\n"));

+			  delete [] tmp;

+		  }

+		  f.close();

+		  if(((ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----"))) == wstring::npos) || ((ws1 = key_buf.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"))) == wstring::npos))

+		  {

+			  MessageBox(0, _T("This is not public key"), _T("INFO"), MB_OK);

+			  break;

+		  }

+		  ws2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));

+		  SetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, key_buf.substr(ws1,ws2-ws1).c_str());

+		  key_buf.clear();

+		  break;

+      }

+      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+      break;

+    }

+    

+  case WM_NOTIFY:

+    {

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

+      {

+        

+      case PSN_APPLY:

+        {

+          return TRUE;

+        }

+      }

+	}

+	break;

+	case WM_CLOSE:

+		DestroyWindow(hwndDlg);

+		break;

+	case WM_DESTROY:

+		hwndLoadPublicKey = NULL;

+		break;

+

+  }

+

+  return FALSE;

+}

+

+void ShowLoadPublicKeyDialog()

+{

+	if (hwndLoadPublicKey == NULL)

+	{

+		hwndLoadPublicKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, DlgProcLoadPublicKey);

+	}

+	SetForegroundWindow(hwndLoadPublicKey);

+}

diff --git a/resource.h b/resource.h
index 157afff..569256d 100644
--- a/resource.h
+++ b/resource.h
@@ -13,8 +13,13 @@
 #define IDC_LOAD_KEY_BUTTON             1022

 #define ID_OK                           1023

 #define ID_LOD_FROM_FILE                1024

+#define ID_LOAD_FROM_FILE               1024

 #define IDC_EDIT1                       1025

 #define IDC_PUBLIC_KEY_EDIT             1025

+#define IDC_BUTTON1                     1026

+#define IDC_SAVE_KEY_BUTTON             1026

+#define IDC_BUTTON2                     1027

+#define IDC_DELETE_KEY_BUTTON           1027

 

 // Next default values for new objects

 // 

@@ -22,7 +27,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        103

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1026

+#define _APS_NEXT_CONTROL_VALUE         1028

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif

diff --git a/utilities.cpp b/utilities.cpp
index 3f03297..16ed0c2 100644
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -1,137 +1,137 @@
-// Copyright © 2010 sss
-// 
-// This program is free software; you can redistribute it and/or
-// 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,
-// 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.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-#include "commonheaders.h"
-
-
-TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef)
-{
-  DBVARIANT dbv = {DBVT_DELETED};
-  TCHAR* szRes;
-  if (DBGetContactSettingTString(hContact, szModule, szSetting, &dbv))
-	 return _tcsdup(szDef);
-  if(dbv.pszVal)
-	  szRes = _tcsdup(dbv.ptszVal);
-  DBFreeVariant(&dbv);
-  return szRes;
-}
-
-char *date()
-{
-	static char d[11];
-	char *tmp = __DATE__, m[4], mn[3] = "01";
-	m[0]=tmp[0];
-	m[1]=tmp[1];
-	m[2]=tmp[2];
-	if(strstr(m,"Jan"))
-		strcpy(mn,"01");
-	else if(strstr(m,"Feb"))
-		strcpy(mn,"02");
-	else if(strstr(m,"Mar"))
-		strcpy(mn,"03");
-	else if(strstr(m,"Apr"))
-		strcpy(mn,"04");
-	else if(strstr(m,"May"))
-		strcpy(mn,"05");
-	else if(strstr(m,"Jun"))
-		strcpy(mn,"06");
-	else if(strstr(m,"Jul"))
-		strcpy(mn,"07");
-	else if(strstr(m,"Aug"))
-		strcpy(mn,"08");
-	else if(strstr(m,"Sep"))
-		strcpy(mn,"09");
-	else if(strstr(m,"Oct"))
-		strcpy(mn,"10");
-	else if(strstr(m,"Nov"))
-		strcpy(mn,"11");
-	else if(strstr(m,"Dec"))
-		strcpy(mn,"12");
-	d[0]=tmp[7];
-	d[1]=tmp[8];
-	d[2]=tmp[9];
-	d[3]=tmp[10];
-	d[4]='.';
-	d[5]=mn[0];
-	d[6]=mn[1];
-	d[7]='.';
-	if (tmp[4] == ' ')
-		d[8] = '0';
-	else
-		d[8]=tmp[4];
-	d[9]=tmp[5];
-	return d;
-}
-
-void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc)
-{
-	TCHAR str[MAX_PATH+2] = {0};
-	OPENFILENAME ofn={0};
-	TCHAR filter[512], *pfilter;
-	ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName);
-	ofn.Flags=OFN_EXPLORER;
-	ofn.lpstrTitle=TranslateW(WindowTittle);
-	_tcscpy(filter,TranslateW(szExtDesc));
-	pfilter=filter+_tcslen(filter)+1;
-	_tcscpy(pfilter, szExt);
-	pfilter[_tcslen(pfilter)+1] = '\0';
-	pfilter[_tcslen(pfilter)+2] = '\0';
-	ofn.lpstrFilter=filter;
-	_tcscpy(str, UniGetContactSettingUtf(0, szModuleName, szSetting, _T("")));
-	if(_tcslen(str)< 2)
-		str[0] = '\0';
-	ofn.lpstrFile=str;
-	ofn.nMaxFile=_MAX_PATH;
-	ofn.nMaxFileTitle=MAX_PATH;
-	if(!GetOpenFileName(&ofn)) 
-		return;
-	DBWriteContactSettingTString(0, szModuleName, szSetting, str);
-}
-
-TCHAR *GetFilePath(TCHAR *WindowTittle, TCHAR *szExt, TCHAR *szExtDesc)
-{
-	TCHAR *str = new TCHAR [MAX_PATH+2];
-	OPENFILENAME ofn={0};
-	TCHAR filter[512], *pfilter;
-	ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName);
-	ofn.Flags=OFN_EXPLORER;
-	ofn.lpstrTitle=TranslateW(WindowTittle);
-	_tcscpy(filter,TranslateW(szExtDesc));
-	pfilter=filter+_tcslen(filter)+1;
-	_tcscpy(pfilter, szExt);
-	pfilter[_tcslen(pfilter)+1] = '\0';
-	pfilter[_tcslen(pfilter)+2] = '\0';
-	ofn.lpstrFilter=filter;
-	_tcscpy(str, _T(""));
-	if(_tcslen(str)< 2)
-		str[0] = '\0';
-	ofn.lpstrFile=str;
-	ofn.nMaxFile=_MAX_PATH;
-	ofn.nMaxFileTitle=MAX_PATH;
-	if(!GetOpenFileName(&ofn)) 
-		return _T("");
-	return str;
-}
-
-void GetFolderPath(TCHAR *WindowTittle, char *szSetting)
-{
-	BROWSEINFO pbi = {0};
-	pbi.lpszTitle = WindowTittle;
-	pbi.ulFlags = BIF_EDITBOX|BIF_NEWDIALOGSTYLE|BIF_SHAREABLE;
+// Copyright © 2010 sss

+// 

+// This program is free software; you can redistribute it and/or

+// 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,

+// 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.

+// 

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+

+

+#include "commonheaders.h"

+

+

+TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef)

+{

+  DBVARIANT dbv = {DBVT_DELETED};

+  TCHAR* szRes;

+  if (DBGetContactSettingTString(hContact, szModule, szSetting, &dbv))

+	 return _tcsdup(szDef);

+  if(dbv.pszVal)

+	  szRes = _tcsdup(dbv.ptszVal);

+  DBFreeVariant(&dbv);

+  return szRes;

+}

+

+char *date()

+{

+	static char d[11];

+	char *tmp = __DATE__, m[4], mn[3] = "01";

+	m[0]=tmp[0];

+	m[1]=tmp[1];

+	m[2]=tmp[2];

+	if(strstr(m,"Jan"))

+		strcpy(mn,"01");

+	else if(strstr(m,"Feb"))

+		strcpy(mn,"02");

+	else if(strstr(m,"Mar"))

+		strcpy(mn,"03");

+	else if(strstr(m,"Apr"))

+		strcpy(mn,"04");

+	else if(strstr(m,"May"))

+		strcpy(mn,"05");

+	else if(strstr(m,"Jun"))

+		strcpy(mn,"06");

+	else if(strstr(m,"Jul"))

+		strcpy(mn,"07");

+	else if(strstr(m,"Aug"))

+		strcpy(mn,"08");

+	else if(strstr(m,"Sep"))

+		strcpy(mn,"09");

+	else if(strstr(m,"Oct"))

+		strcpy(mn,"10");

+	else if(strstr(m,"Nov"))

+		strcpy(mn,"11");

+	else if(strstr(m,"Dec"))

+		strcpy(mn,"12");

+	d[0]=tmp[7];

+	d[1]=tmp[8];

+	d[2]=tmp[9];

+	d[3]=tmp[10];

+	d[4]='.';

+	d[5]=mn[0];

+	d[6]=mn[1];

+	d[7]='.';

+	if (tmp[4] == ' ')

+		d[8] = '0';

+	else

+		d[8]=tmp[4];

+	d[9]=tmp[5];

+	return d;

+}

+

+void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc)

+{

+	TCHAR str[MAX_PATH+2] = {0};

+	OPENFILENAME ofn={0};

+	TCHAR filter[512], *pfilter;

+	ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName);

+	ofn.Flags=OFN_EXPLORER;

+	ofn.lpstrTitle=TranslateW(WindowTittle);

+	_tcscpy(filter,TranslateW(szExtDesc));

+	pfilter=filter+_tcslen(filter)+1;

+	_tcscpy(pfilter, szExt);

+	pfilter[_tcslen(pfilter)+1] = '\0';

+	pfilter[_tcslen(pfilter)+2] = '\0';

+	ofn.lpstrFilter=filter;

+	_tcscpy(str, UniGetContactSettingUtf(0, szModuleName, szSetting, _T("")));

+	if(_tcslen(str)< 2)

+		str[0] = '\0';

+	ofn.lpstrFile=str;

+	ofn.nMaxFile=_MAX_PATH;

+	ofn.nMaxFileTitle=MAX_PATH;

+	if(!GetOpenFileName(&ofn)) 

+		return;

+	DBWriteContactSettingTString(0, szModuleName, szSetting, str);

+}

+

+TCHAR *GetFilePath(TCHAR *WindowTittle, TCHAR *szExt, TCHAR *szExtDesc)

+{

+	TCHAR *str = new TCHAR [MAX_PATH+2];

+	OPENFILENAME ofn={0};

+	TCHAR filter[512], *pfilter;

+	ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName);

+	ofn.Flags=OFN_EXPLORER;

+	ofn.lpstrTitle=TranslateW(WindowTittle);

+	_tcscpy(filter,TranslateW(szExtDesc));

+	pfilter=filter+_tcslen(filter)+1;

+	_tcscpy(pfilter, szExt);

+	pfilter[_tcslen(pfilter)+1] = '\0';

+	pfilter[_tcslen(pfilter)+2] = '\0';

+	ofn.lpstrFilter=filter;

+	_tcscpy(str, _T(""));

+	if(_tcslen(str)< 2)

+		str[0] = '\0';

+	ofn.lpstrFile=str;

+	ofn.nMaxFile=_MAX_PATH;

+	ofn.nMaxFileTitle=MAX_PATH;

+	if(!GetOpenFileName(&ofn)) 

+		return _T("");

+	return str;

+}

+

+void GetFolderPath(TCHAR *WindowTittle, char *szSetting)

+{

+	BROWSEINFO pbi = {0};

+	pbi.lpszTitle = WindowTittle;

+	pbi.ulFlags = BIF_EDITBOX|BIF_NEWDIALOGSTYLE|BIF_SHAREABLE;

 	LPITEMIDLIST pidl = SHBrowseForFolder(&pbi);

 	if (pidl != 0)

 	{

@@ -147,42 +147,42 @@ void GetFolderPath(TCHAR *WindowTittle, char *szSetting)
 			imalloc->Release();

 		}

 	}

-}
-
-int LoadKey(WPARAM w, LPARAM l)
-{
-	void ShowLoadPublicKeyDialog();
-	extern std::map<int, HANDLE> user_data;
-	extern int item_num;
-	item_num = 0;		 //black magic here
-	user_data[1] = (HANDLE)w;
-	ShowLoadPublicKeyDialog();
-	return 0;
-}
-
-	extern HANDLE hLoadPublicKey, hToggleEncryption;
-
-int ToggleEncryption(WPARAM w, LPARAM l)
-{
-	HANDLE hContact = (HANDLE)w;
-	BYTE enc = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);
-	enc?DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 0):DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 1);
-	enc?enc = 0:enc = 1;
-	CLISTMENUITEM mi = {0};
-	mi.cbSize=sizeof(mi);
-	mi.flags = CMIM_NAME;
-	enc?mi.pszName="Turn on GPG encryption":mi.pszName="Turn off GPG encryption";
-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
-	return 0;
-}
-
-int OnPreBuildContactMenu(WPARAM w, LPARAM l)
-{
-	HANDLE hContact = (HANDLE)w;
-	CLISTMENUITEM mi = {0};
-	mi.cbSize=sizeof(mi);
-	mi.flags = CMIM_NAME;
-	DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0)?mi.pszName="Turn on GPG encryption":mi.pszName="Turn off GPG encryption";
-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
-	return 0;
-}
+}

+

+int LoadKey(WPARAM w, LPARAM l)

+{

+	void ShowLoadPublicKeyDialog();

+	extern map<int, HANDLE> user_data;

+	extern int item_num;

+	item_num = 0;		 //black magic here

+	user_data[1] = (HANDLE)w;

+	ShowLoadPublicKeyDialog();

+	return 0;

+}

+

+extern HANDLE hLoadPublicKey, hToggleEncryption;

+

+int ToggleEncryption(WPARAM w, LPARAM l)

+{

+	HANDLE hContact = (HANDLE)w;

+	BYTE enc = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);

+	enc?DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 0):DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 1);

+	enc?enc = 0:enc = 1;

+	CLISTMENUITEM mi = {0};

+	mi.cbSize=sizeof(mi);

+	mi.flags = CMIM_NAME;

+	enc?mi.pszName="Turn off GPG encryption":mi.pszName="Turn on GPG encryption";

+	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);

+	return 0;

+}

+

+int OnPreBuildContactMenu(WPARAM w, LPARAM l)

+{

+	HANDLE hContact = (HANDLE)w;

+	CLISTMENUITEM mi = {0};

+	mi.cbSize=sizeof(mi);

+	mi.flags = CMIM_NAME;

+	DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0)?mi.pszName="Turn on GPG encryption":mi.pszName="Turn off GPG encryption";

+	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);

+	return 0;

+}