removed deprecated kManip field.

2 files changed, 2 insertions, 6 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 0944bd2..a96d6a2 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -366,8 +366,6 @@ data KeyRingOperation = KeyRingOperation
     , opTransforms :: [Transform]
     -- ^ Transformations to be performed on the key pool after all files have
     -- been read and before any have been written.
-    , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate]
-    -- ^ This is deprecated in favor of opTransforms (TODO: remove it)
     , opHome :: Maybe FilePath
     -- ^ If provided, this is the directory where the 'HomeSec' and 'HomePub'
     -- files reside.  Otherwise, the evironment variable $GNUPGHOME is consulted
@@ -1973,8 +1971,8 @@ interpretManip kd manip = return kd
 combineTransforms :: KeyRingOperation -> KeyRingRuntime -> KeyData -> [PacketUpdate]
 combineTransforms operation rt kd = updates
  where
-    updates = kManip operation rt kd
-                ++ concatMap (\t -> resolveTransform t rt kd) sanitized
+    updates = -- kManip operation rt kd ++
+              concatMap (\t -> resolveTransform t rt kd) sanitized
     sanitized = group (sort (opTransforms operation)) >>= take 1
 
 isSubkeySignature (SubkeySignature {}) = True
diff --git a/kiki.hs b/kiki.hs
index 1e4f1e4..a3c0a56 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -738,7 +738,6 @@ sync bExport bImport bSecret cmdarg args_raw = do
             , opPassphrases = do pfile <- maybeToList passfd
                                  return $ PassphraseSpec Nothing Nothing pfile
             , opTransforms = maybe [] (const [Autosign]) $ Map.lookup "--autosign" margs
-            , kManip = noManip
             , opHome = homespec
             }
 
@@ -844,7 +843,6 @@ kiki "show" args = do
             , opPassphrases = do pfile <- maybeToList passfd
                                  return $ PassphraseSpec Nothing Nothing pfile
             , opTransforms = []
-            , kManip = noManip 
             , opHome = homespec
             }