diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-15 15:05:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-15 15:19:07 -0400 |
| commit | e41db4a717f8e92c2c33704196f43224ae6a5ec8 (patch) | |
| tree | 98a1b3925dbd3d62aaeb2c52eb3fa08dc77911a3 | |
| parent | 8796cfbd221b1f3ec771a735c5acbb4e90e39ec3 (diff) | |
webapp: Improved UI for pairing your own devices together using XMPP.
| -rw-r--r-- | Assistant/Threads/XMPPClient.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs index e6ac209d6..fb7da10c7 100644 --- a/Assistant/Threads/XMPPClient.hs +++ b/Assistant/Threads/XMPPClient.hs @@ -274,7 +274,8 @@ pairMsgReceived urlrenderer PairReq theiruuid selfjid theirjid finishXMPPPairing theirjid theiruuid -- Show an alert to let the user decide if they want to pair. showalert = do - let route = ConfirmXMPPPairR (PairKey theiruuid $ formatJID theirjid) + let route = ConfirmXMPPPairFriendR $ + PairKey theiruuid $ formatJID theirjid url <- liftIO $ renderUrl urlrenderer route [] close <- asIO1 removeAlert void $ addAlert $ pairRequestReceivedAlert (T.unpack $ buddyName theirjid) diff --git a/debian/changelog b/debian/changelog index 3538c6b73..176234e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (4.20130315) UNRELEASED; urgency=low * webapp: Repository list is now included in the dashboard, and other UI tweaks. + * webapp: Improved UI for pairing your own devices together using XMPP. -- Joey Hess <joeyh@debian.org> Fri, 15 Mar 2013 00:10:07 -0400 |