From 10418e133ac8dc19a413e151acfdbe784d13486c Mon Sep 17 00:00:00 2001 From: Salvatore Iovene Date: Wed, 3 Aug 2011 10:37:57 +0300 Subject: [PATCH] Cmdline.cpp: we don't need *both* gnome-keyring and kwallet to store the pwd. --- src/syncevo/Cmdline.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/syncevo/Cmdline.cpp b/src/syncevo/Cmdline.cpp index a07ca565..e47ca12d 100644 --- a/src/syncevo/Cmdline.cpp +++ b/src/syncevo/Cmdline.cpp @@ -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