diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-07-31 18:54:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-07-31 18:54:53 +0000 |
| commit | 2ba65d614cd595945f310b6821ba426d35c18348 (patch) | |
| tree | 3127d19197a62902b5422530b8ff72b0fc551187 /plugins/New_GPG/src/gpg_wrapper.cpp | |
| parent | 2614e3d766e7d69407cf6f9f4ece54d8a8fbe13f (diff) | |
unified project for New_GPG
git-svn-id: http://svn.miranda-ng.org/main/trunk@14770 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/New_GPG/src/gpg_wrapper.cpp')
| -rwxr-xr-x | plugins/New_GPG/src/gpg_wrapper.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp index 2c9c57fc92..626be8d6f8 100755 --- a/plugins/New_GPG/src/gpg_wrapper.cpp +++ b/plugins/New_GPG/src/gpg_wrapper.cpp @@ -14,7 +14,7 @@ // 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 "stdafx.h" //thx gpg module from Harald Treder, Zakhar V. Bardymov @@ -168,9 +168,7 @@ bool gpg_launcher(gpg_execution_params ¶ms, boost::posix_time::time_duration return ret; } - - -pxResult pxExecute_passwd_change(std::vector<std::wstring> &aargv, string *aoutput, LPDWORD aexitcode, pxResult *result, boost::process::child *_child, string &old_pass, string &new_pass) +pxResult pxExecute_passwd_change(std::vector<std::wstring> &aargv, pxResult *result, boost::process::child *_child) { if(!gpg_valid) return pxNotConfigured; @@ -192,7 +190,6 @@ pxResult pxExecute_passwd_change(std::vector<std::wstring> &aargv, string *aoutp using namespace boost::process::initializers; using namespace boost::iostreams; - std::vector<std::wstring> argv; std::vector<std::wstring> env; env.push_back(L"LANGUAGE=en@quot"); @@ -339,5 +336,5 @@ pxResult pxExecute_passwd_change(std::vector<std::wstring> &aargv, string *aoutp void pxEexcute_passwd_change_thread(void *param) { gpg_execution_params_pass *params = (gpg_execution_params_pass*)param; - pxResult result = pxExecute_passwd_change(params->args, params->out, params->code, params->result, params->child, params->old_pass, params->new_pass); + pxExecute_passwd_change(params->args, params->result, params->child); } |