From f824a1f41deda932930126568b9c739582f47447 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Dec 2017 11:26:59 -0400 Subject: [PATCH] reorg --- Annex/Notification.hs | 10 ---------- Types/Transfer.hs | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Annex/Notification.hs b/Annex/Notification.hs index 27acd03023..ea24be9833 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 1b54f85110..aa76bf7ec7 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