modified: init.cpp

	modified:   messages.cpp
	modified:   new_gpg.rc
	modified:   options.cpp
	modified:   resource.h
	modified:   utilities.cpp

6 files changed, 34 insertions, 11 deletions

diff --git a/init.cpp b/init.cpp
index 3351c1f..93a812e 100644
--- a/init.cpp
+++ b/init.cpp
@@ -17,7 +17,7 @@
 #include "commonheaders.h"

 

 //global variables

-bool bAppendTags = false, bDebugLog = false;

+bool bAppendTags = false, bDebugLog = false, bJabberAPI = false;

 TCHAR *inopentag = NULL, *inclosetag = NULL, *outopentag = NULL, *outclosetag = NULL, *password = NULL;

 

 list <JabberAccount*> Accounts;

@@ -82,10 +82,11 @@ void init_vars()
 {

 	bAppendTags = DBGetContactSettingByte(NULL, szGPGModuleName, "bAppendTags", 0);

 	inopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("<GPGdec>"));

-	inclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("</GnuPGdec>"));

+	inclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("</GPGdec>"));

 	outopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutOpenTag", _T("<GPGenc>"));

-	outclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("</GnuPgenc>"));

+	outclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("</GPGenc>"));

 	bDebugLog = DBGetContactSettingByte(NULL, szGPGModuleName, "bDebugLog", 0);

+	bJabberAPI = DBGetContactSettingByte(NULL, szGPGModuleName, "bJabberAPI", 1);

 	if(bDebugLog)

 	{

 		TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szLogFilePath", _T("C:\\gpglog.txt"));

diff --git a/messages.cpp b/messages.cpp
index f523778..eeea14b 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -51,8 +51,8 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 		}

 		if((s2 != wstring::npos) && (s1 != wstring::npos))

 		{  //this is public key

-			if(!DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 0))

-				;//

+/*			if(!DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 0))

+				; */

 			void ShowNewKeyDialog();

 			s1 = 0;

 			while((s1 = str.find(_T("\r"), s1)) != wstring::npos)

@@ -247,16 +247,18 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 			DWORD code;

 			wstring cmd;

 			wstring path;

+			extern bool bJabberAPI;

 			char *tmp = UniGetContactSettingUtf(ccs->hContact, szGPGModuleName, "KeyID", "");

 			if(strlen(tmp) < 2)

 			{

 				mir_free(tmp);

 				return CallService(MS_PROTO_CHAINSEND, w, l);

 			}

-//			cmd += _T("--comment \"\" --no-version ");

+			if(!bJabberAPI)

+				cmd += _T("--comment \"\" --no-version ");

 			if(DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwaysTrust", 0))

 				cmd += _T("--trust-model always ");

-			cmd += _T("--comment \"\" --no-version --batch --yes -e -a -r ");

+			cmd += _T("--batch --yes -e -a -r ");

 			TCHAR *tmp2 = mir_a2t(tmp);

 			mir_free(tmp);

 			cmd += tmp2;

@@ -310,7 +312,10 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 				TCHAR tmp[128];

 				f.getline(tmp, 128);

 				str.append(tmp);

-				str.append(_T("\n"));

+				if(bJabberAPI)

+					str.append(_T("\n"));

+				else

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

 			}

 			f.close();

 			DeleteFile(path.c_str());

diff --git a/new_gpg.rc b/new_gpg.rc
index c4250d8..9227e96 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -250,6 +250,8 @@ BEGIN
     CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

     EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL

     PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14

+    CONTROL         "Use jabber api on Miranda IM >= 0.9 (recomended)",IDC_JABBER_API,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,181,10

 END

 

 IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 214

diff --git a/options.cpp b/options.cpp
index b2692c1..8e01742 100644
--- a/options.cpp
+++ b/options.cpp
@@ -173,6 +173,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp);
 		mir_free(tmp);
 		CheckStateLoadDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog", 0);
+		CheckStateLoadDB(hwndDlg, IDC_JABBER_API, "bJabberAPI", 1);
       return TRUE;
     }
     
@@ -300,8 +301,9 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
         
       case PSN_APPLY:
         {
-			extern bool bDebugLog;
+			extern bool bDebugLog, bJabberAPI;
 			bDebugLog = CheckStateStoreDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog");
+			bJabberAPI = CheckStateStoreDB(hwndDlg, IDC_JABBER_API, "bJabberAPI");
 			{
 				TCHAR tmp[512];
 				GetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp, 512);
diff --git a/resource.h b/resource.h
index f8f2870..969d87d 100644
--- a/resource.h
+++ b/resource.h
@@ -55,6 +55,7 @@
 #define IDC_LOG_FILE_SET                1046

 #define IDC_SAVE_PASSWORD               1047

 #define IDC_DEBUG_LOG                   1048

+#define IDC_JABBER_API                  1049

 

 // Next default values for new objects

 // 

@@ -62,7 +63,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        112

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1049

+#define _APS_NEXT_CONTROL_VALUE         1050

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif

diff --git a/utilities.cpp b/utilities.cpp
index 2cef87e..eb14cae 100644
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -313,7 +313,16 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun
 		if(JIftmp)
 		{
 			(*p)->setJabberInterface(JIftmp);
-			(*p)->setAccountName(accounts[i]->tszAccountName);
+			if(accounts[i]->tszAccountName)
+			{
+				TCHAR* tmp = mir_tstrdup(accounts[i]->tszAccountName);
+				(*p)->setAccountName(tmp);
+			}
+			else
+			{
+				TCHAR *tmp = mir_a2t(accounts[i]->szModuleName);
+				(*p)->setAccountName(tmp);
+			}
 			(*p)->setAccountNumber(a);
 			(*p)->setSendHandler(INVALID_HANDLE_VALUE);
 			a++;
@@ -328,6 +337,9 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun
 
 static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pUserData)
 {
+	extern bool bJabberAPI;
+	if(!bJabberAPI)
+		return FALSE;
 	HXML local_node = node;
 	for(int n = 0; n <= xi.getChildCount(node); n++)
 	{