diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index 991c6069..8097944a 100644 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -67,9 +67,11 @@ namespace SparkleShare { InvokeOnMainThread (delegate { UpdatesTextField.StringValue = "You are running the latest version."; UpdatesTextField.TextColor = - NSColor.FromCalibratedRgba (0.45f, 0.82f, 0.09f, 1.0f); // Tango Chameleon #2 + NSColor.FromCalibratedRgba (0.31f, 0.60f, 0.02f, 1.0f); // Tango Chameleon #3 }); }; + + SparkleShare.Controller.CheckForNewVersion (); } diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index 149db34e..7fffcb15 100644 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -40,9 +40,7 @@ namespace SparkleShare { public SparkleAbout () : base ("") { - - DefaultSize = new Gdk.Size (360, 260); - + DefaultSize = new Gdk.Size (360, 260); BorderWidth = 0; IconName = "folder-sparkleshare"; WindowPosition = WindowPosition.Center; @@ -50,29 +48,22 @@ namespace SparkleShare { Resizable = false; CreateAbout (); - SparkleShare.Controller.CheckForNewVersion (); SparkleShare.Controller.NewVersionAvailable += delegate (string new_version) { - Application.Invoke (delegate { Version.Markup = "A newer version (" + new_version + ") is available!"; Version.ShowAll (); }); - }; - SparkleShare.Controller.VersionUpToDate += delegate { - Application.Invoke (delegate { - - Version.Markup = "You are running the latest version."; + Version.Markup = "You are running the latest version."; Version.ShowAll (); - }); - }; + SparkleShare.Controller.CheckForNewVersion (); } diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index f9425394..c30a2e9b 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -1293,9 +1293,8 @@ namespace SparkleShare { } - private void CheckForNewVersion () + public void CheckForNewVersion () { - string new_version_file_path = System.IO.Path.Combine (SparklePaths.SparkleTmpPath, "version"); @@ -1308,22 +1307,18 @@ namespace SparkleShare { web_client.DownloadFileCompleted += delegate { if (new FileInfo (new_version_file_path).Length > 0) { - StreamReader reader = new StreamReader (new_version_file_path); string downloaded_version_number = reader.ReadToEnd ().Trim (); - if (!Defines.VERSION.Equals (downloaded_version_number)) { - - if (NewVersionAvailable != null) - NewVersionAvailable (downloaded_version_number); - - } else { + if (Defines.VERSION.Equals (downloaded_version_number)) { if (VersionUpToDate != null) VersionUpToDate (); + } else { + if (NewVersionAvailable != null) + NewVersionAvailable (downloaded_version_number); } - } };