From c1b682cb8f8913e1af43a7711aeb2f8858db6d64 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 16 Apr 2013 19:23:26 -0400
Subject: [PATCH] another no-xmpp fix

---
 Assistant/WebApp/Configurators/Pairing.hs | 5 +----
 Assistant/WebApp/Configurators/XMPP.hs    | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Assistant/WebApp/Configurators/Pairing.hs b/Assistant/WebApp/Configurators/Pairing.hs
index 84ec4ce305..a5b13560bf 100644
--- a/Assistant/WebApp/Configurators/Pairing.hs
+++ b/Assistant/WebApp/Configurators/Pairing.hs
@@ -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 
diff --git a/Assistant/WebApp/Configurators/XMPP.hs b/Assistant/WebApp/Configurators/XMPP.hs
index d1eee141f7..43059854a9 100644
--- a/Assistant/WebApp/Configurators/XMPP.hs
+++ b/Assistant/WebApp/Configurators/XMPP.hs
@@ -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