From 0400c5f596f94797e56d33dcf6b0fc394b08d6de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 16 Mar 2013 19:19:58 -0400
Subject: [PATCH] fix redirect from XMPP prompt to pairing pages

---
 Assistant/WebApp/Configurators/Pairing.hs | 10 ++++++++--
 Assistant/WebApp/Configurators/XMPP.hs    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Assistant/WebApp/Configurators/Pairing.hs b/Assistant/WebApp/Configurators/Pairing.hs
index 628058a06b..84ec4ce305 100644
--- a/Assistant/WebApp/Configurators/Pairing.hs
+++ b/Assistant/WebApp/Configurators/Pairing.hs
@@ -58,7 +58,10 @@ getStartXMPPPairFriendR = ifM (isJust <$> liftAnnex getXMPPCreds)
 		liftAssistant $ sendNetMessage QueryPresence
 		pairPage $
 			$(widgetFile "configurators/pairing/xmpp/friend/prompt")
-	, redirect XMPPR -- go get XMPP configured, then come back
+	, do
+		-- go get XMPP configured, then come back
+		setUltDestCurrent
+		redirect XMPPR
 	)
 #else
 getStartXMPPPairFriendR = noXMPPPairing
@@ -71,7 +74,10 @@ getStartXMPPPairSelfR :: Handler RepHtml
 #ifdef WITH_XMPP
 getStartXMPPPairSelfR = go =<< liftAnnex getXMPPCreds
   where
-  	go Nothing = redirect XMPPR -- go get XMPP configured, then come back
+  	go Nothing = do
+		-- go get XMPP configured, then come back
+		setUltDestCurrent
+		redirect XMPPR
 	go (Just creds) = do
 		{- Ask buddies to send presence info, to get
 		 - the buddy list populated. -}
diff --git a/Assistant/WebApp/Configurators/XMPP.hs b/Assistant/WebApp/Configurators/XMPP.hs
index 716b305772..62b21f3bdf 100644
--- a/Assistant/WebApp/Configurators/XMPP.hs
+++ b/Assistant/WebApp/Configurators/XMPP.hs
@@ -110,7 +110,7 @@ postXMPPR = xmppPage $ do
 	storecreds creds = do
 		void $ liftAnnex $ setXMPPCreds creds
 		liftAssistant notifyNetMessagerRestart
-		redirectBack
+		redirectUltDest DashboardR
 #else
 getXMPPR = xmppPage $
 	$(widgetFile "configurators/xmpp/disabled")