another no-xmpp fix
This commit is contained in:
parent
9f7bef4750
commit
c1b682cb8f
2 changed files with 4 additions and 5 deletions
|
@ -87,9 +87,6 @@ getStartXMPPPairSelfR = go =<< liftAnnex getXMPPCreds
|
|||
$(widgetFile "configurators/pairing/xmpp/self/prompt")
|
||||
#else
|
||||
getStartXMPPPairSelfR = noXMPPPairing
|
||||
|
||||
noXMPPPairing :: Handler RepHtml
|
||||
noXMPPPairing = noPairing "XMPP"
|
||||
#endif
|
||||
|
||||
getRunningXMPPPairFriendR :: BuddyKey -> Handler RepHtml
|
||||
|
@ -187,7 +184,7 @@ getFinishXMPPPairFriendR (PairKey theiruuid t) = case parseJID t of
|
|||
finishXMPPPairing theirjid theiruuid
|
||||
xmppPairStatus False $ Just theirjid
|
||||
#else
|
||||
getFinishXMPPPairR _ = noXMPPPairing
|
||||
getFinishXMPPPairFriendR _ = noXMPPPairing
|
||||
#endif
|
||||
|
||||
{- Displays a page indicating pairing status and
|
||||
|
|
|
@ -64,6 +64,7 @@ checkCloudRepos urlrenderer r =
|
|||
checkCloudRepos _ _ = noop
|
||||
#endif
|
||||
|
||||
#ifdef WITH_XMPP
|
||||
{- Returns the name of the friend corresponding to a
|
||||
- repository's UUID, but not if it's our name. -}
|
||||
getBuddyName :: UUID -> Assistant (Maybe String)
|
||||
|
@ -78,6 +79,7 @@ getBuddyName u = go =<< getclientjid
|
|||
<$> getXMPPRemotes
|
||||
getclientjid = maybe Nothing parseJID . xmppClientID
|
||||
<$> getDaemonStatus
|
||||
#endif
|
||||
|
||||
getNeedCloudRepoR :: UUID -> Handler RepHtml
|
||||
#ifdef WITH_XMPP
|
||||
|
@ -85,7 +87,7 @@ getNeedCloudRepoR for = page "Cloud repository needed" (Just Configuration) $ do
|
|||
buddyname <- liftAssistant $ getBuddyName for
|
||||
$(widgetFile "configurators/xmpp/needcloudrepo")
|
||||
#else
|
||||
getNeedCloudRepoR = xmppPage $
|
||||
getNeedCloudRepoR _ = xmppPage $
|
||||
$(widgetFile "configurators/xmpp/disabled")
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue