maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cmdline.cpp: we don't need *both* gnome-keyring and kwallet to store the pwd.

Browse source
This commit is contained in:
Salvatore Iovene 2011-08-03 10:37:57 +03:00 committed by Patrick Ohly
parent 410ef51e1e
commit 10418e133a
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/syncevo/Cmdline.cpp
View file

@ -742,19 +742,12 @@ bool Cmdline::run() {
SyncContext::throwError("--dry-run not supported for configuration changes");
}
if (m_keyring) {
#ifndef USE_GNOME_KEYRING
#if (!defined USE_GNOME_KEYRING) and (!defined USE_KDE_KWALLET)
m_err << "Error: this syncevolution binary was compiled without support for storing "
"passwords in a keyring. Either store passwords in your configuration "
"passwords in a keyring or wallet. Either store passwords in your configuration "
"files or enter them interactively on each program run." << endl;
return false;
#endif
#ifndef USE_KDE_KWALLET
m_err << "Error: this syncevolution binary was compiled without support for storing "
"passwords in a wallet. Either store passwords in your configuration "
"files or enter them interactively on each program run." << endl;
return false;
#endif
}
// name of renamed config ("foo.old") after migration