reorg

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. -}

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