summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-05 16:23:56 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-05 16:23:56 -0400
commite61d4e633d933bcaf7e01206b1c2c24fd894ff69 (patch)
treea4345d50210c4c0ebdca0f61d779efd6ab6c48fa
parent5c46685ab3bc1f579e55d764d5887b7f4a208d65 (diff)
fix pair complete alert combining
The pairing complete alert had been conbining with some other alert, fixed this and now it's displayed once xmpp pairing is complete on both sides.
-rw-r--r--Assistant/Alert.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index ea576c668..65f8c3e67 100644
--- a/Assistant/Alert.hs
+++ b/Assistant/Alert.hs
@@ -313,6 +313,7 @@ pairRequestAcknowledgedAlert :: String -> Maybe AlertButton -> Alert
pairRequestAcknowledgedAlert who button = baseActivityAlert
{ alertData = ["Pairing with", UnTensed (T.pack who), Tensed "in progress" "complete"]
, alertPriority = High
+ , alertName = Just $ PairAlert who
, alertCombiner = Just $ dataCombiner $ \_old new -> new
, alertButton = button
}