Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 136 insertions, 14 deletions

diff --git a/options.cpp b/options.cpp
index 7eafe97..109d54c 100644..100755
--- a/options.cpp
+++ b/options.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2010 sss

+// Copyright © 2010-2012 sss

 // 

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

 // modify it under the terms of the GNU General Public License

@@ -21,6 +21,7 @@ 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);

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

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

 

 BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef)

 {

@@ -74,6 +75,18 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts;

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

 

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

+

+	odp.cbSize = sizeof(odp);

+	odp.hInstance = hInst;

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED);

+	odp.pszTitle = szGPGModuleName;

+	odp.pszGroup = "Services";

+	odp.pszTab = "Advanced";

+	odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY;

+	odp.pfnDlgProc = (DLGPROC)DlgProcGpgAdvOpts;

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

+

 	return 0;

 }

 

@@ -151,13 +164,19 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				mir_free(tmp2);

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

 				mir_free(tmp);

-				tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", "");

-				tmp = mir_a2t(tmp2);

+				char *tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", "");

+				if(!toUTF16(tmp2).empty())

+					tmp = mir_wstrdup(toUTF16(tmp2).c_str());

+				else

+					tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", _T(""));

 				mir_free(tmp2);

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

 				mir_free(tmp);

 				tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", "");

-				tmp = mir_a2t(tmp2);

+				if(!toUTF16(tmp2).empty())

+					tmp = mir_wstrdup(toUTF16(tmp2).c_str());

+				else

+					tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", _T(""));

 				mir_free(tmp2);

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

 				mir_free(tmp);

@@ -180,15 +199,16 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));

 		{

-			string keyinfo = Translate("Current private key id: ");

+			string keyinfo = Translate("Default private key id");

+			keyinfo += ": ";

 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

-			keyinfo += (strlen(keyid) > 0)?keyid:"not set";

+			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");

 			mir_free(keyid);

 			SetDlgItemTextA(hwndDlg, IDC_CURRENT_KEY, keyinfo.c_str());

 		}

 		if(bIsMiranda09)

 			CheckStateLoadDB(hwndDlg, IDC_JABBER_API, "bJabberAPI", 1);

-		CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 1);

+		CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 0);

 		CheckStateLoadDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange", 0);

       return TRUE;

     }

@@ -353,6 +373,51 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			  f.close();

 		  }

 		  break;

+	  case IDC_COPY_KEY:

+		  {

+			  if(OpenClipboard(hwndDlg))

+			  {

+				  char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");

+				  std::string str = szKey;;

+				  mir_free(szKey);

+				  for(std::string::size_type i = str.find("\n"); i != std::string::npos; i = str.find("\n", i+2))

+					  str.replace(i, 1, "\r\n"); 

+				  HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, str.size() +1);

+				  if(!hMem)

+				  {

+					  MessageBoxA(0, "Failed to alocate memory", "Error", MB_OK);

+					  break;

+				  }

+				  szKey = (char*)GlobalLock(hMem);

+				  if(!szKey)

+				  {

+					  char msg[64];

+					  mir_snprintf(msg, 127, "Failed to lock memory with error %d", GetLastError());

+					  MessageBoxA(0, msg, "Error", MB_OK);

+					  GlobalFree(hMem);

+				  }

+				  memcpy(szKey, str.c_str(), str.size());

+				  szKey[str.size()] = '\0';

+				  str.clear();

+				  EmptyClipboard();

+				  GlobalUnlock(hMem);

+				  if(!SetClipboardData(CF_OEMTEXT, hMem))

+				  {

+					  GlobalFree(hMem);

+					  char msg[64];

+					  mir_snprintf(msg, 127, "Failed write to clipboard with error %d", GetLastError());

+					  MessageBoxA(0, msg, "Error", MB_OK);

+				  }

+				  CloseClipboard();

+			  }

+			  else

+			  {

+				  char msg[64];

+				  mir_snprintf(msg, 127, "Failed to open clipboard with error %d", GetLastError());

+				  MessageBoxA(0, msg, "Error", MB_OK);

+			  }

+		  }

+		  break;

 	  case IDC_LOG_FILE_SET:

 		  {

 			  tmp = GetFilePath(_T("Set log file"), _T("*"), _T("LOG files"), 1);

@@ -366,7 +431,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
       SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

       break;

     }

-    

+   

   case WM_NOTIFY:

     {

 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && IsDlgButtonChecked(hwndDlg, IDC_JABBER_API)));

@@ -481,10 +546,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					  else

 					  {

 						  bad_version = false;

-						  MessageBox(0, _T("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);

+						  MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);

 					  }

-					  if(bad_version)

-						  MessageBox(0, _T("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);

+/*					  if(bad_version) //looks like working fine with gpg2

+						  MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); */

 				  }

 			  }

 			  char mir_path[MAX_PATH];

@@ -557,6 +622,7 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
     {

 		TranslateDialogDefault(hwndDlg);

 		CheckStateLoadDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags", 0);

+		CheckStateLoadDB(hwndDlg, IDC_STRIP_TAGS, "bStripTags", 0);

 		{

 			TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("<GPGdec>"));

 			SetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp);

@@ -597,6 +663,7 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
       case PSN_APPLY:

         {

 			bAppendTags = CheckStateStoreDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags");

+			bStripTags = CheckStateStoreDB(hwndDlg, IDC_STRIP_TAGS, "bStripTags");

 			{

 				TCHAR tmp[128];

 				GetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp, 128);

@@ -629,12 +696,67 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
   return FALSE;

 }

 

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

+{

+  switch (msg)

+  {

+  case WM_INITDIALOG:

+    {

+		extern bool bJabberAPI;

+		TranslateDialogDefault(hwndDlg);

+		CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning", 0);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION), bJabberAPI);

+

+      return TRUE;

+    }

+    

+ 

+  case WM_COMMAND:

+    {

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

+      break;

+    }

+    

+  case WM_NOTIFY:

+    {

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

+      {

+        

+      case PSN_APPLY:

+        {

+			bPresenceSigning = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning");

+          return TRUE;

+        }

+      }

+	}

+    break;

+  }

+  return FALSE;

+}

+

 HWND hPubKeyEdit = NULL;

 

+LONG_PTR default_edit_proc = NULL;

+

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

+{

+	LRESULT ret = 0;

+	switch(msg)

+	{

+	case WM_KEYDOWN:

+		if(wParam == 0x41 && GetKeyState(VK_CONTROL)< 0 )

+			SendMessage(hwndDlg, EM_SETSEL, 0, -1);

+		break;

+	default:

+		ret = CallWindowProc((WNDPROC)default_edit_proc, hwndDlg, msg, wParam, lParam);

+		break;

+	}

+	return ret;

+}

 

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

 {

-	HANDLE hContact = user_data[item_num+1];

+	static HANDLE hContact = user_data[item_num+1];

 

 

 	TCHAR *tmp = NULL;

@@ -645,7 +767,9 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
   {

   case WM_INITDIALOG:

     {

+		default_edit_proc = GetWindowLong(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), GWLP_WNDPROC);

 		SetWindowPos(hwndDlg, 0, load_key_rect.left, load_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);

+		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), GWLP_WNDPROC, (LONG_PTR)editctrl_ctrl_a);

 		HANDLE hcnt = hContact;

 		if(metaIsProtoMetaContacts(hcnt))

 			hcnt = metaGetMostOnline(hcnt);

@@ -761,7 +885,6 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 		return TRUE;

     }

     

- 

   case WM_COMMAND:

     {

       switch (LOWORD(wParam))

@@ -1250,7 +1373,6 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 			DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", load_key_rect.top);

 		}

 		break;

-

   }

 

   return FALSE;