summaryrefslogtreecommitdiff
path: root/plugins/New_GPG/src/gpg_wrapper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/New_GPG/src/gpg_wrapper.cpp')
-rwxr-xr-xplugins/New_GPG/src/gpg_wrapper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp
index ca0a7a694f..53ad7e2c8e 100755
--- a/plugins/New_GPG/src/gpg_wrapper.cpp
+++ b/plugins/New_GPG/src/gpg_wrapper.cpp
@@ -21,7 +21,7 @@ pxResult pxExecute(std::vector<std::wstring> &aargv, string *aoutput, LPDWORD ae
if (!globals.gpg_valid)
return pxNotConfigured;
- wchar_t *bin_path = UniGetContactSettingUtf(0, MODULENAME, "szGpgBinPath", L"");
+ wchar_t *bin_path = db_get_wsa(0, MODULENAME, "szGpgBinPath", L"");
{
if (!boost::filesystem::exists(bin_path)) {
mir_free(bin_path);
@@ -42,7 +42,7 @@ pxResult pxExecute(std::vector<std::wstring> &aargv, string *aoutput, LPDWORD ae
env.push_back(L"LC_ALL=English");
env.push_back(L"LANG=C");
argv.push_back(bin_path);
- wchar_t *home_dir = UniGetContactSettingUtf(0, MODULENAME, "szHomePath", L"");
+ wchar_t *home_dir = db_get_wsa(0, MODULENAME, "szHomePath", L"");
if (mir_wstrlen(home_dir)) //this check are required for first run gpg binary validation
{
argv.push_back(L"--homedir");
@@ -156,7 +156,7 @@ pxResult pxExecute_passwd_change(std::vector<std::wstring> &aargv, pxResult *res
if (!globals.gpg_valid)
return pxNotConfigured;
- wchar_t *bin_path = UniGetContactSettingUtf(0, MODULENAME, "szGpgBinPath", L"");
+ wchar_t *bin_path = db_get_wsa(0, MODULENAME, "szGpgBinPath", L"");
{
if (!boost::filesystem::exists(bin_path)) {
mir_free(bin_path);
@@ -177,7 +177,7 @@ pxResult pxExecute_passwd_change(std::vector<std::wstring> &aargv, pxResult *res
env.push_back(L"LC_ALL=English");
argv.push_back(bin_path);
argv.push_back(L"--homedir");
- wchar_t *home_dir = UniGetContactSettingUtf(0, MODULENAME, "szHomePath", L"");
+ wchar_t *home_dir = db_get_wsa(0, MODULENAME, "szHomePath", L"");
argv.push_back(home_dir);
mir_free(home_dir);
argv.push_back(L"--display-charset");