From 4e84774cb12a1f5ad0988a546b7d1e215105da42 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 29 May 2011 23:36:01 +0100 Subject: [PATCH] mac: also use growl for conflict bubble --- SparkleShare/Mac/SparkleUI.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs index c3baa437..84a51047 100644 --- a/SparkleShare/Mac/SparkleUI.cs +++ b/SparkleShare/Mac/SparkleUI.cs @@ -123,7 +123,15 @@ namespace SparkleShare { }); }; - + + SparkleShare.Controller.ConflictNotificationRaised += delegate { + string title = "Ouch! Mid-air collision!"; + string subtext = "Don't worry, SparkleShare made a copy of each conflicting file."; + + new SparkleBubble (title, subtext).Show (); + }; + + SparkleShare.Controller.AvatarFetched += delegate { InvokeOnMainThread (delegate { foreach (SparkleLog log in SparkleUI.OpenLogs)