summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-12-14 11:26:59 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-12-14 11:26:59 -0400
commitc51fa6c80358b9029c07ebe788df6b2262f5b745 (patch)
treefdf887a19c99b951783d3c4532628aa68f74017c
parent5173d94a051a56d16aa600dcdb941e7af4c6d878 (diff)
reorg
-rw-r--r--Annex/Notification.hs10
-rw-r--r--Types/Transfer.hs10
2 files changed, 10 insertions, 10 deletions
diff --git a/Annex/Notification.hs b/Annex/Notification.hs
index 27acd0302..ea24be983 100644
--- a/Annex/Notification.hs
+++ b/Annex/Notification.hs
@@ -12,7 +12,6 @@ module Annex.Notification (NotifyWitness, noNotification, notifyTransfer, notify
import Annex.Common
import Types.Transfer
-import Utility.Url
#ifdef WITH_DBUS_NOTIFICATIONS
import qualified Annex
import Types.DesktopNotify
@@ -27,15 +26,6 @@ data NotifyWitness = NotifyWitness
noNotification :: NotifyWitness
noNotification = NotifyWitness
-class Transferrable t where
- descTransfrerrable :: t -> Maybe String
-
-instance Transferrable AssociatedFile where
- descTransfrerrable (AssociatedFile af) = af
-
-instance Transferrable URLString where
- descTransfrerrable = Just
-
{- Wrap around an action that performs a transfer, which may run multiple
- attempts. Displays notification when supported and when the user asked
- for it. -}
diff --git a/Types/Transfer.hs b/Types/Transfer.hs
index 1b54f8511..aa76bf7ec 100644
--- a/Types/Transfer.hs
+++ b/Types/Transfer.hs
@@ -13,6 +13,7 @@ import Types
import Types.Remote (Verification(..))
import Utility.PID
import Utility.QuickCheck
+import Utility.Url
import Data.Time.Clock.POSIX
import Control.Concurrent
@@ -91,3 +92,12 @@ instance Observable (Maybe a) where
observeBool (Just _) = True
observeBool Nothing = False
observeFailure = Nothing
+
+class Transferrable t where
+ descTransfrerrable :: t -> Maybe String
+
+instance Transferrable AssociatedFile where
+ descTransfrerrable (AssociatedFile af) = af
+
+instance Transferrable URLString where
+ descTransfrerrable = Just