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

List:       kde-commits
Subject:    branches/work/kgpg2
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2008-01-17 17:42:05
Message-ID: 1200591725.924831.17175.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 762689 by dakon:

port remaing bits of key import to model/view

 M  +1 -1      keysmanager.cpp  
 M  +4 -4      kgpginterface.cpp  


--- branches/work/kgpg2/keysmanager.cpp #762688:762689
@@ -2170,7 +2170,7 @@
             {
                 changeMessage(i18n("Importing..."), 0, true);
                 KgpgInterface *importKeyProcess = new KgpgInterface();
-                connect(importKeyProcess,SIGNAL(importKeyFinished(QStringList)),keysList2,SLOT(slotReloadKeys(QStringList)));
 +                connect(importKeyProcess, SIGNAL(importKeyFinished(QStringList)), \
imodel, SLOT(refreshKeys(QStringList)));  importKeyProcess->importKey(keystr);
             }
         }
--- branches/work/kgpg2/kgpginterface.cpp #762688:762689
@@ -1594,7 +1594,8 @@
         if (messageList[8] != "0")
         {
             resultMessage += i18np("<qt>One revocation certificate imported.</qt>", \
                "<qt>%1 revocation certificates imported.</qt>", \
                messageList[8].toULong());
-            importedKeysIds = QStringList("ALL");
+            // empty list means "reload all"
+            importedKeysIds.clear();
         }
         if (messageList[9] != "0")
         {
@@ -1613,12 +1614,11 @@
                                   "Please note that imported secret keys are not \
trusted by default.<br />"  "To fully use this secret key for signing and encryption, \
you must edit the key (double click on it) and set its trust to Full or \
Ultimate.</qt>");  
-    }
+        emit importKeyFinished(importedKeysIds);
+   }
     else
         resultMessage = i18n("No key imported... \nCheck detailed log for more \
infos");  
-    emit importKeyFinished(importedKeysIds);
-
     // TODO : should be deleted. KgpgInterface should not show any dialog (but \
                password).
     // When a message should be shown, it should be passed by parameter in a SIGNAL.
     (void) new KgpgDetailedInfo(0, resultMessage, message, importedKeys);


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