controller: always install protocol handler, not just on the first run

This commit is contained in:
Hylke Bons 2012-02-19 16:04:43 +01:00
parent e68a832aec
commit ff55094651
2 changed files with 4 additions and 6 deletions

View file

@ -90,7 +90,7 @@ namespace SparkleShare {
// Add a little delay, making it seems we're // Add a little delay, making it seems we're
// actually doing hard work // actually doing hard work
Thread.Sleep (2 * 1000); Thread.Sleep (1000);
if (running_version >= new_version) { if (running_version >= new_version) {
if (VersionUpToDateEvent != null) if (VersionUpToDateEvent != null)

View file

@ -138,18 +138,16 @@ namespace SparkleShare {
{ {
InstallLauncher (); InstallLauncher ();
EnableSystemAutostart (); EnableSystemAutostart ();
InstallProtocolHandler ();
// Create the SparkleShare folder and add it to the bookmarks // Create the SparkleShare folder and add it to the bookmarks
if (CreateSparkleShareFolder ()) if (CreateSparkleShareFolder ())
AddToBookmarks (); AddToBookmarks ();
if (FirstRun) { if (FirstRun)
SparkleConfig.DefaultConfig.SetConfigOption ("notifications", bool.TrueString); SparkleConfig.DefaultConfig.SetConfigOption ("notifications", bool.TrueString);
InstallProtocolHandler (); else
} else {
ImportPrivateKey (); ImportPrivateKey ();
}
// Watch the SparkleShare folder // Watch the SparkleShare folder
FileSystemWatcher watcher = new FileSystemWatcher (SparkleConfig.DefaultConfig.FoldersPath) { FileSystemWatcher watcher = new FileSystemWatcher (SparkleConfig.DefaultConfig.FoldersPath) {