[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/commands
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-04-29 11:36:30
Message-ID: 1209468990.773747.6101.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802433 by mutz:

Oh, just pass --keyserver keys.gnupg.net when no keyserver is configured yet.

 M  +13 -7     refreshopenpgpcertscommand.cpp  


--- trunk/KDE/kdepim/kleopatra/commands/refreshopenpgpcertscommand.cpp #802432:802433
@@ -70,14 +70,15 @@
 bool RefreshOpenPGPCertsCommand::preStartHook( QWidget * parent ) const {
     if ( !haveKeyserverConfigured() )
         if ( KMessageBox::warningContinueCancel( parent,
-                                                 i18n( "<para>No OpenPGP directory \
                services have been configured. "
-                                                       "If not all of the \
                certificates carry the name of their preferred "
-                                                       "certificate server, a \
                fallback server is needed to fetch from. "
-                                                       "Since none is configured, \
                the backend might report an error to that "
-                                                       "effect.</para>"
+                                                 i18n( "<para>No OpenPGP directory \
services have been configured.</para>" +                                              \
"<para>If not all of the certificates carry the name of their preferred " +           \
"certificate server (few do), a fallback server is needed to fetch from.</para>" +    \
"<para>Since none is configured, <application>Kleopatra</application> will use " +    \
                "<resource>keys.gnupg.net</resource> as the fallback.</para>"
                                                        "<para>You can configure \
                OpenPGP directory servers in Kleopatra's "
                                                        "configuration \
                dialog.</para>"
-                                                       "<para>Do you want to \
continue without a fallback server?</para>" ), +                                      \
"<para>Do you want to continue with <resource>keys.gnupg.net</resource> " +           \
                "as fallback server?</para>" ),
                                                  i18n("OpenPGP Certitifcate \
                Refresh"),
                                                  KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                  QLatin1String( \
"warn-refresh-openpgp-missing-keyserver" ) ) @@ -97,7 +98,12 @@
 }
 
 QStringList RefreshOpenPGPCertsCommand::arguments() const {
-    return QStringList() << gpgPath() << "--refresh-keys";
+    QStringList result;
+    result << gpgPath();
+    if ( !haveKeyserverConfigured() )
+        result << "--keyserver" << "keys.gnupg.net";
+    result << "--refresh-keys";
+    return result;
 }
 
 QString RefreshOpenPGPCertsCommand::errorCaption() const {


[prev in list] [next in list] [prev in thread] [next in thread]