another no-xmpp fix

This commit is contained in:
Joey Hess 2013-04-16 19:23:26 -04:00
parent 9f7bef4750
commit c1b682cb8f
2 changed files with 4 additions and 5 deletions

View file

@ -87,9 +87,6 @@ getStartXMPPPairSelfR = go =<< liftAnnex getXMPPCreds
$(widgetFile "configurators/pairing/xmpp/self/prompt") $(widgetFile "configurators/pairing/xmpp/self/prompt")
#else #else
getStartXMPPPairSelfR = noXMPPPairing getStartXMPPPairSelfR = noXMPPPairing
noXMPPPairing :: Handler RepHtml
noXMPPPairing = noPairing "XMPP"
#endif #endif
getRunningXMPPPairFriendR :: BuddyKey -> Handler RepHtml getRunningXMPPPairFriendR :: BuddyKey -> Handler RepHtml
@ -187,7 +184,7 @@ getFinishXMPPPairFriendR (PairKey theiruuid t) = case parseJID t of
finishXMPPPairing theirjid theiruuid finishXMPPPairing theirjid theiruuid
xmppPairStatus False $ Just theirjid xmppPairStatus False $ Just theirjid
#else #else
getFinishXMPPPairR _ = noXMPPPairing getFinishXMPPPairFriendR _ = noXMPPPairing
#endif #endif
{- Displays a page indicating pairing status and {- Displays a page indicating pairing status and

View file

@ -64,6 +64,7 @@ checkCloudRepos urlrenderer r =
checkCloudRepos _ _ = noop checkCloudRepos _ _ = noop
#endif #endif
#ifdef WITH_XMPP
{- Returns the name of the friend corresponding to a {- Returns the name of the friend corresponding to a
- repository's UUID, but not if it's our name. -} - repository's UUID, but not if it's our name. -}
getBuddyName :: UUID -> Assistant (Maybe String) getBuddyName :: UUID -> Assistant (Maybe String)
@ -78,6 +79,7 @@ getBuddyName u = go =<< getclientjid
<$> getXMPPRemotes <$> getXMPPRemotes
getclientjid = maybe Nothing parseJID . xmppClientID getclientjid = maybe Nothing parseJID . xmppClientID
<$> getDaemonStatus <$> getDaemonStatus
#endif
getNeedCloudRepoR :: UUID -> Handler RepHtml getNeedCloudRepoR :: UUID -> Handler RepHtml
#ifdef WITH_XMPP #ifdef WITH_XMPP
@ -85,7 +87,7 @@ getNeedCloudRepoR for = page "Cloud repository needed" (Just Configuration) $ do
buddyname <- liftAssistant $ getBuddyName for buddyname <- liftAssistant $ getBuddyName for
$(widgetFile "configurators/xmpp/needcloudrepo") $(widgetFile "configurators/xmpp/needcloudrepo")
#else #else
getNeedCloudRepoR = xmppPage $ getNeedCloudRepoR _ = xmppPage $
$(widgetFile "configurators/xmpp/disabled") $(widgetFile "configurators/xmpp/disabled")
#endif #endif