summaryrefslogtreecommitdiff
path: root/messages.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-07-28 15:40:51 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-07-28 15:40:51 +0300
commit419feb8c29847e1174478b370edd37107627ba80 (patch)
treedf6212ee0ba447546dd2136a3833f0bb29cfbcb7 /messages.cpp
parent64c6452c697a05ab0b0d4bbbda167ddc35215397 (diff)
ported to miranda_ng
Diffstat (limited to 'messages.cpp')
-rwxr-xr-xmessages.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/messages.cpp b/messages.cpp
index 18b2378..f2e3c35 100755
--- a/messages.cpp
+++ b/messages.cpp
@@ -177,6 +177,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
return 0;
}
+ //TODO: check gpg output for errors
_terminate = false;
while(out.find("public key decryption failed: bad passphrase") != string::npos)
{
@@ -240,6 +241,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
return 0;
}
+ //TODO: check gpg output for errors
}
out.clear();
gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
@@ -263,6 +265,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
DeleteFile(path.c_str());
HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
}
+ //TODO: check gpg output for errors
{
wstring tmp = tmp2;
tmp += _T("\\tmp\\");
@@ -434,6 +437,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
}
if(result == pxNotFound)
return 1;
+ //TODO: check gpg output for errors
{
char *tmp = NULL;
string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
@@ -707,6 +711,7 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
mir_free(msg);
return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
}
+ //TODO: check gpg output for errors
if(out.find("There is no assurance this key belongs to the named user") != string::npos)
{
out.clear();
@@ -736,6 +741,7 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
mir_free(msg);
return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
}
+ //TODO: check gpg output for errors
}
else
{