From a4667e3e8cb7fae50b0c2cb8bc1a46df0b289b6c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Nov 2012 17:43:17 -0400 Subject: finished XMPP pairing! This includes keeping track of which buddies we're pairing with, to know which PairAck are legitimate. --- Assistant/Alert.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Assistant/Alert.hs') diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 8d9455e66..9e36ea693 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -317,7 +317,7 @@ pairRequestReceivedAlert who button = Alert pairRequestAcknowledgedAlert :: String -> Maybe AlertButton -> Alert pairRequestAcknowledgedAlert who button = baseActivityAlert - { alertData = ["Pair request with", UnTensed (T.pack who), Tensed "in progress" "complete"] + { alertData = ["Pairing with", UnTensed (T.pack who), Tensed "in progress" "complete"] , alertPriority = High , alertCombiner = Just $ dataCombiner $ \_old new -> new , alertButton = button -- cgit v1.2.3