diff --git a/SparkleShare/Mac/SparkleMacWatcher.cs b/SparkleShare/Mac/SparkleMacWatcher.cs index 88ca7d28..26a42ff8 100755 --- a/SparkleShare/Mac/SparkleMacWatcher.cs +++ b/SparkleShare/Mac/SparkleMacWatcher.cs @@ -58,16 +58,11 @@ namespace SparkleShare { private DateTime last_found_timestamp; private IntPtr m_stream; private FSEventStreamCallback m_callback; // need to keep a reference around so that it isn't GC'ed - private static readonly IntPtr kCFRunLoopDefaultMode = (new NSString ("kCFRunLoopDefaultMode")).Handle; + private static readonly IntPtr kCFRunLoopDefaultMode = new NSString ("kCFRunLoopDefaultMode").Handle; private ulong kFSEventStreamEventIdSinceNow = 0xFFFFFFFFFFFFFFFFUL; - private delegate void FSEventStreamCallback ( - IntPtr streamRef, - IntPtr clientCallBackInfo, - int numEvents, - IntPtr eventPaths, - IntPtr eventFlags, - IntPtr eventIds); + private delegate void FSEventStreamCallback (IntPtr streamRef, IntPtr clientCallBackInfo, + int numEvents, IntPtr eventPaths, IntPtr eventFlags, IntPtr eventIds); ~SparkleMacWatcher () diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs index 694a0e6d..096c7959 100644 --- a/SparkleShare/Program.cs +++ b/SparkleShare/Program.cs @@ -54,7 +54,7 @@ namespace SparkleShare { "under certain conditions. Please read the GNU GPLv3 for details." + n + n + "Usage: sparkleshare [start|stop|restart]"); - Console.WriteLine ("SparkleShare is already running."); + Environment.Exit (-1); } diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs index 02af0167..657a6aee 100755 --- a/SparkleShare/SparkleAboutController.cs +++ b/SparkleShare/SparkleAboutController.cs @@ -73,6 +73,7 @@ namespace SparkleShare { NewVersionEvent (latest_version); else VersionUpToDateEvent (); + } catch { } } diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 32692595..88240671 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -757,9 +757,7 @@ namespace SparkleShare { return true; } else { - SparkleLogger.LogInfo ("Controller", - "Not connecting to https://www.gravatar.com/ due to invalid certificate"); - + SparkleLogger.LogInfo ("Controller", "Invalid certificate for https://www.gravatar.com/"); return false; } }