From fe1b8e88cbe20d09026545aee38a447b1f88f070 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 11 Jul 2013 10:08:59 +0100 Subject: [PATCH] linux eventlog: Ask for confirmation when overwriting an existing file when restoring. #1336 --- SparkleShare/Linux/SparkleEventLog.cs | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs index c7d9ffa5..0601f0ea 100755 --- a/SparkleShare/Linux/SparkleEventLog.cs +++ b/SparkleShare/Linux/SparkleEventLog.cs @@ -131,20 +131,21 @@ namespace SparkleShare { }); }; - Controller.ShowSaveDialogEvent += delegate (string file_name, string target_folder_path) { + Controller.ShowSaveDialogEvent += delegate (string file_name, string target_folder_path) { Application.Invoke (delegate { FileChooserDialog dialog = new FileChooserDialog ("Restore from History", - this, FileChooserAction.Save, "Cancel", ResponseType.Cancel, "Save", ResponseType.Ok); + this, FileChooserAction.Save, "Cancel", ResponseType.Cancel, "Save", ResponseType.Ok); - dialog.CurrentName = file_name; - dialog.SetCurrentFolder (target_folder_path); - - if (dialog.Run () == (int) ResponseType.Ok) - Controller.SaveDialogCompleted (dialog.Filename); - else - Controller.SaveDialogCancelled (); - - dialog.Destroy (); + dialog.CurrentName = file_name; + dialog.DoOverwriteConfirmation = true; + dialog.SetCurrentFolder (target_folder_path); + + if (dialog.Run () == (int) ResponseType.Ok) + Controller.SaveDialogCompleted (dialog.Filename); + else + Controller.SaveDialogCancelled (); + + dialog.Destroy (); }); }; @@ -154,7 +155,7 @@ namespace SparkleShare { }); }; - Controller.UpdateChooserEnablementEvent += delegate (bool enabled) { + Controller.UpdateChooserEnablementEvent += delegate (bool enabled) { Application.Invoke (delegate { this.combo_box.Sensitive = enabled; });