Merge lp:~tintou/scratch/fix-save into lp:~elementary-apps/scratch/scratch

[Corentin Noël]

Prevent Scratch from reload a currently open file from disk before it has the opportunity to save it.

Fixed a bug making Scratch load the content of the file in the disk when the current view is not even saved…

[Gero.Bare (gero-bare)]

Nice. This works pretty well.

review: Approve

[Gero.Bare (gero-bare)]

Ok I think I should correct my previous statement.
This is a huge improvement, yet I found a little bug.

For example you have a bunch of "do" skips some, replace for "don't" then replace all, then sometimes a "empty file" appears in the undo history.

But I didn't see a loss of data though. So it's a huge improvement.

But for now I think I should abstain and let other judge this.

But this branch seems to work fine otherwise.

review: Abstain

[Robert Roth (evfool)]

All the changes make sense, and as gero-bare mentions the data-loss issue is gone, I think we should approve this.
As of gero-bare's comment giving an example for an incorrect use-case: that looks like a corner-case, which is unlikely to be related to the code changes done here, but has surfaced due to the critical issue being gone, that should be handled in a separate bugreport.

review: Approve

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2015-05-10 07:10:54 +0000
+++ src/Services/Document.vala	2015-05-20 22:10:15 +0000
@@ -582,7 +582,7 @@
                         return;
                     }
 
-                    if (source_view.buffer.get_modified ()) {
+                    if (!source_view.buffer.get_modified ()) {
                         if (settings.autosave) {
                             source_view.set_text (new_buffer.text, false);
                         } else {

=== modified file 'src/Widgets/SearchManager.vala'
--- src/Widgets/SearchManager.vala	2015-05-15 08:16:47 +0000
+++ src/Widgets/SearchManager.vala	2015-05-20 22:10:15 +0000
@@ -36,7 +36,7 @@
         public Gtk.SearchEntry replace_entry;
         public Gtk.SpinButton go_to_entry;
         private Gtk.Adjustment go_to_adj;
-        
+
         private Gtk.ToolButton replace_tool_button;
         private Gtk.ToolButton replace_all_tool_button;
 
@@ -163,10 +163,10 @@
                 warning ("No SourceView is associated with SearchManager!");
                 return;
             }
-            
+
             if (this.text_view != null)
                 this.text_buffer.modified_changed.disconnect (on_text_buffer_modified);
-                
+
             this.text_view = text_view;
             this.text_buffer = text_view.get_buffer ();
             this.search_context = new Gtk.SourceSearchContext (text_buffer as Gtk.SourceBuffer, null);
@@ -222,18 +222,11 @@
                 return;
             }
             string replace_string = replace_entry.text;
-            // temporarily disable all textbuffer changed signal handlers
-            this.text_buffer.modified_changed.disconnect (on_text_buffer_modified);
             this.window.get_current_document ().toggle_changed_handlers (false);
-            var replaced = search_context.replace_all (replace_string, replace_string.length);
+            search_context.replace_all (replace_string, replace_string.length);
             update_tool_arrows (search_entry.text);
             update_replace_tool_sensitivities (search_entry.text, false);
-            // reenable all disabled buffer changed signal handlers
-            this.text_buffer.modified_changed.connect (on_text_buffer_modified);
             this.window.get_current_document ().toggle_changed_handlers (true);
-            // notify the buffer of the change after replace all
-            if (replaced > 0)
-                this.text_buffer.modified_changed ();
         }
 
         public void set_search_string (string to_search) {